From c301203905f834b9e7789380beb65164782fde28 Mon Sep 17 00:00:00 2001 From: fzielcke Date: Mon, 13 Apr 2009 11:45:20 +0000 Subject: [PATCH] 2009-04-13 Felix Zielcke * util/i386/pc/grub-install.in (install_drive): Remove the BSD partition number. (grub_drive): Likewise. --- ChangeLog | 6 ++++++ util/i386/pc/grub-install.in | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 916a8c2c5..40b18b275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-04-13 Felix Zielcke + + * util/i386/pc/grub-install.in (install_drive): Remove the BSD + partition number. + (grub_drive): Likewise. + 2009-04-13 David S. Miller * kern/sparc64/ieee1275/ieee1275.c: New file. diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in index ff1ed1e75..8a7a4daef 100644 --- a/util/i386/pc/grub-install.in +++ b/util/i386/pc/grub-install.in @@ -262,8 +262,8 @@ if [ "x${devabstraction_module}" = "x" ] ; then grub_drive="`$grub_probe --target=drive --device ${grub_device}`" # Strip partition number - install_drive="`echo ${install_drive} | sed -e s/,[0-9]*//g`" - grub_drive="`echo ${grub_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]*[a-z]*//g`" if [ "${target_cpu}-${platform}" != "i386-pc" ] ; then # generic method (used on coreboot) uuid="`$grub_probe --target=fs_uuid --device ${grub_device}`"