Wipe the first label if writing the second one failed.

diff --git a/lib/label/label.c b/lib/label/label.c
index a277294342a30ff2ba9c1326db1cc4646e17e6d6..1ea94be0a47067477af255c7e209ff450aeb9f09 100644 (file)
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -267,8 +267,16 @@ int label_write(struct device *dev, struct label *label)
     /* Write another at the end of the device */
     status2 = dev_write(dev, offset[1], sizeof(struct label_ondisk) + label->datalen, block);
     if (!status2)
+    {
+       char zerobuf[sizeof(struct label_ondisk)];
        log_error("Error writing label 2\n");
 
+       /* Wipe the first label so it doesn't get confusing */
+       memset(zerobuf, 0, sizeof(struct label_ondisk));
+       if (!dev_write(dev, offset[0], sizeof(struct label_ondisk), zerobuf))
+           log_error("Error erasing label 1\n");
+    }
+
     pool_free(label_pool, block);
     dev_close(dev);