2009-04-13 Felix Zielcke <fzielcke@z-51.de>

* util/i386/pc/grub-install.in (install_drive): Remove the BSD
	partition number.
	(grub_drive): Likewise.
This commit is contained in:
fzielcke 2009-04-13 11:45:20 +00:00
parent d8e1836ca1
commit c301203905
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2009-04-13 Felix Zielcke <fzielcke@z-51.de>
* util/i386/pc/grub-install.in (install_drive): Remove the BSD
partition number.
(grub_drive): Likewise.
2009-04-13 David S. Miller <davem@davemloft.net> 2009-04-13 David S. Miller <davem@davemloft.net>
* kern/sparc64/ieee1275/ieee1275.c: New file. * kern/sparc64/ieee1275/ieee1275.c: New file.

View file

@ -262,8 +262,8 @@ if [ "x${devabstraction_module}" = "x" ] ; then
grub_drive="`$grub_probe --target=drive --device ${grub_device}`" grub_drive="`$grub_probe --target=drive --device ${grub_device}`"
# Strip partition number # Strip partition number
install_drive="`echo ${install_drive} | sed -e s/,[0-9]*//g`" install_drive="`echo ${install_drive} | sed -e s/,[0-9]*[a-z]*//g`"
grub_drive="`echo ${grub_drive} | sed -e s/,[0-9]*//g`" grub_drive="`echo ${grub_drive} | sed -e s/,[0-9]*[a-z]*//g`"
if [ "${target_cpu}-${platform}" != "i386-pc" ] ; then if [ "${target_cpu}-${platform}" != "i386-pc" ] ; then
# generic method (used on coreboot) # generic method (used on coreboot)
uuid="`$grub_probe --target=fs_uuid --device ${grub_device}`" uuid="`$grub_probe --target=fs_uuid --device ${grub_device}`"