revise the fix for floppy device handling in grub-install.

diff --git a/ChangeLog b/ChangeLog
index 92b382e56d9922d021477a5072cdafab582867e7..37805da0648728e1ffaa5653741fc214ee0b5776 100644 (file)
--- 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 959ce2c9a50af319a15b038cd5a2b4d24734e89d..0c3eb45d8ff4cf6661a24f35474f0547223dabd6 100644 (file)
--- 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 ad5bd7c5597cecee555c5055f3e0f42c28159484..fefd114b3458d79a06f62d76126d48789361a2cd 100644 (file)
--- 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%'`