Bug#377005: grub: Patch to fix install on AoE root device

[James Harper]

Package: grub
Version: 0.97-12
Severity: normal
Tags: patch


grub-install fails to install on AoE devices (eg /dev/etherd/e0.0). This
patch allows grub-install to correctly detect the drive and partitions.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-xen
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

Versions of packages grub depends on:
ii  libc6                         2.3.6-15   GNU C Library: Shared
libraries
ii  libncurses5                   5.5-1      Shared libraries for
terminal hand

grub recommends no packages.

-- no debconf information
-------------- next part --------------
--- grub-install	2006-07-04 09:27:31.000000000 +1000
+++ grub-install.new	2006-07-06 11:57:10.000000000 +1000
@@ -148,13 +148,16 @@
 				  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
 				  -e 's%\(fd[0-9]*\)$%\1%' \
 				  -e 's%/part[0-9]*$%/disc%' \
-				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%'`
+				  -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
+				  -e 's%\(e[0-9]\.[0-9]*\).*$%\1%'`
 	tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
 				  -e 's%.*d[0-9]*p%%' \
 				  -e 's%.*/fd[0-9]*$%%' \
 				  -e 's%.*/floppy/[0-9]*$%%' \
 				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
-				  -e 's%.*c[0-7]d[0-9]*p%%'`
+				  -e 's%.*c[0-7]d[0-9]*p%%' \
+				  -e 's%.*e[0-9]\.[0-9]*p%%' \
+				  -e 's%.*e[0-9]\.[0-9]*\$%%'`
 	;;
     gnu*)
 	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`