vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
robertmh 2004-07-20 19:30:24 +00:00
parent e92d461e1c
commit 31831d933f
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2004-07-16 Yoshinori K. Okuji <okuji@enbug.org>
* util/grub-install.in (convert): Fix the sed statement for * util/grub-install.in (convert): Fix the sed statement for

8
util/grub-install.in
View file

@ -111,14 +111,14 @@ convert () {
gnu*) gnu*)
tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'` tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;; 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%' \ 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%'` | sed 's%r\{0,1\}\(da[0-9]*\).*$%r\1%'`
tmp_part=`echo "$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\}[saw]d[0-9]\(s[0-9]*[a-h]\)%\1%" \
| sed "s%.*/r\{0,1\}da[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%' \ 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%'` | sed 's%r\{0,1\}\(fd[0-9]*\).*$%r\1a%'`
tmp_part=`echo "$1" \ tmp_part=`echo "$1" \
@ -159,7 +159,7 @@ convert () {
| sed "s%)%,$tmp_bsd_partition)%"` | sed "s%)%,$tmp_bsd_partition)%"`
fi fi
echo "$tmp_drive" ;; echo "$tmp_drive" ;;
freebsd*) freebsd* | kfreebsd*-gnu)
if echo $tmp_part | grep "^s" >/dev/null; then if echo $tmp_part | grep "^s" >/dev/null; then
tmp_pc_slice=`echo $tmp_part \ tmp_pc_slice=`echo $tmp_part \
| sed "s%s\([0-9]*\)[a-h]*$%\1%"` | sed "s%s\([0-9]*\)[a-h]*$%\1%"`
@ -173,7 +173,7 @@ convert () {
| sed "s%)%,$tmp_bsd_partition)%"` | sed "s%)%,$tmp_bsd_partition)%"`
fi fi
echo "$tmp_drive" ;; echo "$tmp_drive" ;;
netbsd*) netbsd* | knetbsd*-gnu)
if echo $tmp_part | grep "^[abe-p]$" >/dev/null; then if echo $tmp_part | grep "^[abe-p]$" >/dev/null; then
tmp_bsd_partition=`echo "$tmp_part" \ tmp_bsd_partition=`echo "$tmp_part" \
| sed "s%\([a-p]\)$%\1%"` | sed "s%\([a-p]\)$%\1%"`