[2520] Revert 2 previous commits.

[Vladimir Serbinenko]

Revision: 2520
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2520
Author:   phcoder
Date:     2009-08-23 23:40:29 +0000 (Sun, 23 Aug 2009)
Log Message:
-----------
Revert 2 previous commits.

2009-08-23  Vladimir Serbinenko  <address@hidden>

        Fix grub-install.

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub-probe.c
    trunk/grub2/util/i386/efi/grub-install.in
    trunk/grub2/util/i386/pc/grub-install.in
    trunk/grub2/util/sparc64/ieee1275/grub-install.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-08-23 23:24:33 UTC (rev 2519)
+++ trunk/grub2/ChangeLog       2009-08-23 23:40:29 UTC (rev 2520)
@@ -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  <address@hidden>
 

Modified: trunk/grub2/util/grub-probe.c
===================================================================
--- trunk/grub2/util/grub-probe.c       2009-08-23 23:24:33 UTC (rev 2519)
+++ trunk/grub2/util/grub-probe.c       2009-08-23 23:40:29 UTC (rev 2520)
@@ -97,7 +97,7 @@
     grub_util_error ("Invalid partition map %s", name);
 
   *underscore = '\0';
-  printf ("%s\n", name);
+  printf ("part_%s\n", name);
   free (name);
 }
 

Modified: trunk/grub2/util/i386/efi/grub-install.in
===================================================================
--- trunk/grub2/util/i386/efi/grub-install.in   2009-08-23 23:24:33 UTC (rev 
2519)
+++ trunk/grub2/util/i386/efi/grub-install.in   2009-08-23 23:40:29 UTC (rev 
2520)
@@ -188,7 +188,7 @@
 # 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}`

Modified: trunk/grub2/util/i386/pc/grub-install.in
===================================================================
--- trunk/grub2/util/i386/pc/grub-install.in    2009-08-23 23:24:33 UTC (rev 
2519)
+++ trunk/grub2/util/i386/pc/grub-install.in    2009-08-23 23:40:29 UTC (rev 
2520)
@@ -261,7 +261,7 @@
 # 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}`

Modified: trunk/grub2/util/sparc64/ieee1275/grub-install.in
===================================================================
--- trunk/grub2/util/sparc64/ieee1275/grub-install.in   2009-08-23 23:24:33 UTC 
(rev 2519)
+++ trunk/grub2/util/sparc64/ieee1275/grub-install.in   2009-08-23 23:40:29 UTC 
(rev 2520)
@@ -220,7 +220,7 @@
 # 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}`