From cfbf950f5dbf4fbae3d7a249fa734148dcf58f42 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Fri, 13 Jul 2001 11:51:24 +0000
Subject: [PATCH] Fix a problem when you specify a Linux devfs floppy device
 name to grub-install.

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

diff --git a/ChangeLog b/ChangeLog
index 985dd6c02..566bc2836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-13  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* util/grub-install.in (convert): Recognize the naming scheme
+	for Linux devfs floppy devices. Reported by Jason Thomas
+	<jason@topic.com.au>.
+	
 2001-07-07  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* netboot/compile: New file. This was also missing... How many
diff --git a/util/grub-install.in b/util/grub-install.in
index b7f24d484..23c3e0b2b 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -81,6 +81,7 @@ convert () {
 				  -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%.*/floppy/[0-9]*$%%' \
 				  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%'`
 	;;
     gnu*)