From 0f8fdcc8b2f986ae9d5355d25f5dc1d1e3e9295e Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Sat, 14 Oct 2000 17:04:45 +0000
Subject: [PATCH] added support for native devfs device names into
 grub-install.

---
 ChangeLog            | 6 ++++++
 THANKS               | 1 +
 util/grub-install.in | 7 +++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 52c436de6..875d7cc02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-15  OKUJI Yoshinori  <okuji@gnu.org>
+
+	From Roderich Schupp <rsch@ExperTeam.de>:
+	* util/grub-install.in (convert): Added support for "native"
+	devfs device names.
+	
 2000-10-14  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* docs/tutorial.texi (Serial terminal): Fixed a typo.
diff --git a/THANKS b/THANKS
index df14bc76e..a593f4995 100644
--- a/THANKS
+++ b/THANKS
@@ -46,6 +46,7 @@ Pavel Roskin <pavel_roskin@geocities.com>
 Per Lundberg <plundis@byggdok.se>
 Peter Astrand <altic@lysator.liu.se>
 Ramon van Handel <vhandel@chem.vu.nl>
+Roderich Schupp <rsch@ExperTeam.de>
 Stefan Ondrejicka <ondrej@idata.sk>
 Stephen Early <steve@greenend.org.uk>
 Takehiro Suzuki <takehiro@coral.ocn.ne.jp>
diff --git a/util/grub-install.in b/util/grub-install.in
index e6d6df41b..8d12c9c04 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -74,8 +74,11 @@ convert () {
     # Break the device name into the disk part and the partition part.
     case "$host_os" in
     linux*)
-	tmp_disk=`echo "$1" | sed 's%\([sh]d[a-z]\)[0-9]*$%\1%'`
-	tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;;
+	tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%'
+				  -e 's%/part[0-9]*$%/disc%'`
+	tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%'
+				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%'`
+	;;
     gnu*)
 	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
 	tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;;