* util/grub-setup.c (setup): Don't clean blocklists before readability

	verfification.

diff --git a/ChangeLog b/ChangeLog
index 7fa6586d1d6d5f21a58eb5ba2cd4565f17483ba3..731abcb0f14b190097d29c68081b07a9db5310e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-setup.c (setup): Don't clean blocklists before readability
+       verfification.
+
 2010-10-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * docs/grub.texi (Installation): Document embedding zone. Remove

diff --git a/util/grub-setup.c b/util/grub-setup.c
index 920d867f2c3f06148b4aba6f7cfff16668a9557a..ab0098468b5ea93e9488b6dcc37384f595d132d0 100644 (file)
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -319,18 +319,6 @@ setup (const char *dir,
   }
 #endif
 
-  /* Clean out the blocklists.  */
-  block = first_block;
-  while (block->len)
-    {
-      grub_memset (block, 0, sizeof (block));
-
-      block--;
-
-      if ((char *) block <= core_img)
-       grub_util_error ("No terminator in the core image");
-    }
-
 #ifdef GRUB_MACHINE_PCBIOS
   {
     grub_partition_map_t dest_partmap = NULL;
@@ -434,6 +422,18 @@ setup (const char *dir,
        goto unable_to_embed;
       }
 
+    /* Clean out the blocklists.  */
+    block = first_block;
+    while (block->len)
+      {
+       grub_memset (block, 0, sizeof (block));
+      
+       block--;
+
+       if ((char *) block <= core_img)
+         grub_util_error ("No terminator in the core image");
+      }
+
     save_first_sector (sectors[0] + grub_partition_get_start (container),
                       0, GRUB_DISK_SECTOR_SIZE);