From fb01925bdfd0a252689d32c05ef55699ac2f0c2a Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Wed, 13 Dec 2000 17:15:30 +0000
Subject: [PATCH] revise the fix for floppy device handling in grub-install.

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

diff --git a/ChangeLog b/ChangeLog
index 92b382e56..37805da06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-14  OKUJI Yoshinori  <okuji@gnu.org>
+
+	From Erik Schoenfelder <schoenfr@gaertner.de>:
+	* util/grub-install.in (convert): Revised the fix for floppy
+	device handling.
+	
 2000-12-14  OKUJI Yoshinori  <okuji@gnu.org>
 
 	From HORIKAWA Kazunori <kaz-hori@tkd.att.ne.jp>:
diff --git a/THANKS b/THANKS
index 959ce2c9a..0c3eb45d8 100644
--- a/THANKS
+++ b/THANKS
@@ -20,6 +20,7 @@ Daniel Wagner <wagi@gmx.ch>
 Edmund GRIMLEY EVANS <edmundo@rano.demon.co.uk>
 Edward Killips <ekillips@triton.net>
 Eric Hanchrow <erich@microsoft.com>
+Erik Schoenfelder <schoenfr@gaertner.de>
 Frank Mehnert <fm3@os.inf.tu-dresden.de>
 Goran Koruga <goran.koruga@hermes.si>
 Hal Snyder <hal@vailsys.com>
diff --git a/util/grub-install.in b/util/grub-install.in
index ad5bd7c55..fefd114b3 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -77,11 +77,11 @@ convert () {
     case "$host_os" in
     linux*)
 	tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
+				  -e 's%\(fd[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%.*/fd[0-9]*$%%' \
 				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%'`
-	# floppy drives don't have partitions:
-	tmp_part=`echo "$tmp_part" | sed -e 's%.*/fd[0-9]*%%'`
 	;;
     gnu*)
 	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`