vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert 2 previous commits.

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

	Fix grub-install.

	* util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'.
This commit is contained in:
phcoder 2009-08-23 23:40:29 +00:00
parent af0f0beafa
commit 0b8e386c09
5 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -2,9 +2,7 @@
Fix grub-install. Fix grub-install.
* util/i386/pc/grub-install.in: Add 'part_' to partmap_module. * util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'.
* util/i386/efi/grub-install.in: Likewise.
* util/sparc64/ieee1275/grub-install.in: Likewise.
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com> 2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>

2
util/grub-probe.c
View file

@ -97,7 +97,7 @@ probe_partmap (grub_disk_t disk)
grub_util_error ("Invalid partition map %s", name); grub_util_error ("Invalid partition map %s", name);
*underscore = '\0'; *underscore = '\0';
printf ("%s\n", name); printf ("part_%s\n", name);
free (name); free (name);
} }

2
util/i386/efi/grub-install.in
View file

@ -188,7 +188,7 @@ fi
# Then the partition map module. In order to support partition-less media, # 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 # this command is allowed to fail (--target=fs already grants us that the
# filesystem will be accessible). # 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). # Device abstraction module, if any (lvm, raid).
devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_map} ${grubdir}` devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_map} ${grubdir}`

2
util/i386/pc/grub-install.in
View file

@ -261,7 +261,7 @@ fi
# Then the partition map module. In order to support partition-less media, # 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 # this command is allowed to fail (--target=fs already grants us that the
# filesystem will be accessible). # 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). # Device abstraction module, if any (lvm, raid).
devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}` devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}`

2
util/sparc64/ieee1275/grub-install.in
View file

@ -220,7 +220,7 @@ fi
# Then the partition map module. In order to support partition-less media, # 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 # this command is allowed to fail (--target=fs already grants us that the
# filesystem will be accessible). # 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). # Device abstraction module, if any (lvm, raid).
devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}` devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}`