* util/grub-install.in: Detect GNU/k*BSD systems as well.

diff --git a/ChangeLog b/ChangeLog
index bb37a6c392971b6a92b768361537a6aec0508727..5b0b13f1f1ddd33cf1284f66769bf54df5eb4dcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-20  Robert Millan  <robertmh@gnu.org>
+
+       * util/grub-install.in: Detect GNU/k*BSD systems as well.
+
 2004-07-16  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * util/grub-install.in (convert): Fix the sed statement for

diff --git a/util/grub-install.in b/util/grub-install.in
index b4625ec30d5b1ebb6355ee6781e392d59c854ffa..2e598b05f5b79259c699610b659ad09b35641fba 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -111,14 +111,14 @@ convert () {
     gnu*)
        tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
        tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;;
-    freebsd*)
+    freebsd* | kfreebsd*-gnu)
        tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%r\1%' \
                            | sed 's%r\{0,1\}\(da[0-9]*\).*$%r\1%'`
        tmp_part=`echo "$1" \
            | sed "s%.*/r\{0,1\}[saw]d[0-9]\(s[0-9]*[a-h]\)%\1%" \
                    | sed "s%.*/r\{0,1\}da[0-9]\(s[0-9]*[a-h]\)%\1%"`
        ;;
-    netbsd*)
+    netbsd* | knetbsd*-gnu)
        tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([sw]d[0-9]*\).*$%r\1d%' \
            | sed 's%r\{0,1\}\(fd[0-9]*\).*$%r\1a%'`
        tmp_part=`echo "$1" \
@@ -159,7 +159,7 @@ convert () {
                    | sed "s%)%,$tmp_bsd_partition)%"`
            fi
            echo "$tmp_drive" ;;
-       freebsd*)
+       freebsd* | kfreebsd*-gnu)
            if echo $tmp_part | grep "^s" >/dev/null; then
                tmp_pc_slice=`echo $tmp_part \
                    | sed "s%s\([0-9]*\)[a-h]*$%\1%"`
@@ -173,7 +173,7 @@ convert () {
                    | sed "s%)%,$tmp_bsd_partition)%"`
            fi
            echo "$tmp_drive" ;;
-       netbsd*)
+       netbsd* | knetbsd*-gnu)
            if echo $tmp_part | grep "^[abe-p]$" >/dev/null; then
                tmp_bsd_partition=`echo "$tmp_part" \
                    | sed "s%\([a-p]\)$%\1%"`