Revert 2 previous commits.

2009-08-23  Vladimir Serbinenko  <phcoder@gmail.com>

	Fix grub-install.

	* util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'.

diff --git a/ChangeLog b/ChangeLog
index 0af2eb8b392032acb849d15e4da0d94515dff968..80d3f89a7b86ddbb551dea3d5d73ce04973c75aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,7 @@
 
        Fix grub-install.
 
-       * util/i386/pc/grub-install.in: Add 'part_' to partmap_module.
-       * util/i386/efi/grub-install.in: Likewise.
-       * util/sparc64/ieee1275/grub-install.in: Likewise.
+       * util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'.
 
 2009-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
 

diff --git a/util/grub-probe.c b/util/grub-probe.c
index 7c63f64ef7f4e4ecfe2719d838c9ccfe25f7a516..c8dbc0175a986a8ff6cc521a17cf73b42be21feb 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -97,7 +97,7 @@ probe_partmap (grub_disk_t disk)
     grub_util_error ("Invalid partition map %s", name);
 
   *underscore = '\0';
-  printf ("%s\n", name);
+  printf ("part_%s\n", name);
   free (name);
 }
 

diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index db459885d24ccc0335c58f5b327c40ff1070c8cf..a5f97e3462cf35a661f5e963e40ae338ccdf72c5 100644 (file)
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -188,7 +188,7 @@ fi
 # Then the partition map module.  In order to support partition-less media,
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
-partmap_module=part_`$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`
+partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`
 
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_map} ${grubdir}`

diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in
index b6ee9577260c26684a17309f65893bb19948dbb3..8ceb811ddc61caaa461a47f0b629bafdbffbef55 100644 (file)
--- a/util/i386/pc/grub-install.in
+++ b/util/i386/pc/grub-install.in
@@ -261,7 +261,7 @@ fi
 # Then the partition map module.  In order to support partition-less media,
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
-partmap_module=part_`$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`
+partmap_module=`$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`
 
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}`

diff --git a/util/sparc64/ieee1275/grub-install.in b/util/sparc64/ieee1275/grub-install.in
index c7c50da713133d9b233b03f11e5387c5fc099397..5cfb858d797cfe73b450ce78939a767c1bc7c3cf 100644 (file)
--- a/util/sparc64/ieee1275/grub-install.in
+++ b/util/sparc64/ieee1275/grub-install.in
@@ -220,7 +220,7 @@ fi
 # Then the partition map module.  In order to support partition-less media,
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
-partmap_module=part_`$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`
+partmap_module=`$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`
 
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}`