From: okuji <okuji@localhost>
Date: Fri, 16 Jul 2004 11:49:58 +0000 (+0000)
Subject: 2004-07-16  Yoshinori K. Okuji  <okuji@enbug.org>
X-Git-Tag: 0.6.96~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e92d461e1c3a11638639c67bea05be2a8861457e;p=thirdparty%2Fgrub.git

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 b4af5cee1..bb37a6c39 100644
--- 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 e5fb0c272..b4625ec30 100644
--- 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%'`