[PATCH] remove BSD partition number from install_drive/grub_drive in grub-install

[Felix Zielcke <fzielcke@z-51.de>]

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

Hi,

on BSD grub-install thinks that you're wanting to do a cross-install
when in fact you won't.
The problem is that in install_drive the BSD partition number isn't
removed before doing the cross-install check.
I'm not sure if the regexp is okay so or if it could be better, but at
least it works for me.
Though then grub-install still fails with `grub-setup: error: cannot
open `/dev/da0' in open_device()'
-- 
Felix Zielcke

[-- Attachment #2: remove_bsd_partnumber.diff --]
[-- Type: text/x-patch, Size: 965 bytes --]

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

	* util/i386/pc/grub-install.in (install_drive): Remove the BSD
	partition number.
	(grub_drive): Likewise.

Index: util/i386/pc/grub-install.in
===================================================================
--- util/i386/pc/grub-install.in	(revision 2083)
+++ util/i386/pc/grub-install.in	(working copy)
@@ -262,8 +262,8 @@ if [ "x${devabstraction_module}" = "x" ]
     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}`"