2004-07-16 Yoshinori K. Okuji <okuji@enbug.org>

        * util/grub-install.in (convert): Fix the sed statement for
        Linux. The expression was ambigious in some cases.

diff --git a/ChangeLog b/ChangeLog
index b4af5cee1ee44eb60e9801e1afe960c72d7397b9..bb37a6c392971b6a92b768361537a6aec0508727 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-16  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * util/grub-install.in (convert): Fix the sed statement for
+       Linux. The expression was ambigious in some cases.
+
 2004-06-29  Robert Millan  <robertmh@gnu.org>
 
        * util/grub-set-default.in: Fix minor syntax error (non-escaped

diff --git a/util/grub-install.in b/util/grub-install.in
index e5fb0c272a6cd50518eaf02e02a233a4cbc161f9..b4625ec30d5b1ebb6355ee6781e392d59c854ffa 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -102,11 +102,11 @@ convert () {
                                  -e 's%/part[0-9]*$%/disc%' \
                                  -e 's%\(c[0-7]d[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%.*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%%'`
        ;;
     gnu*)
        tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`