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

fix a bug in grub-install, which affected only GNU/Hurd.

Browse source
This commit is contained in:
okuji 2000-09-30 01:35:21 +00:00
parent 225b464978
commit 504e540242
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2000-09-30 OKUJI Yoshinori <okuji@gnu.org>
* util/grub-install.in (convert): The code for gnu* (i.e.
GNU/Hurd) was rewritten, since it didn't work for BSD
partitions.
Use "$tmp_disk *$" instead of "$tmp_disk" to get the drive name.
2000-09-30 OKUJI Yoshinori <okuji@gnu.org> 2000-09-30 OKUJI Yoshinori <okuji@gnu.org>
* stage2/fsys_reiserfs.c (reiserfs_mount): Check if the length * stage2/fsys_reiserfs.c (reiserfs_mount): Check if the length

21
util/grub-install.in
View file

@ -76,7 +76,7 @@ convert () {
tmp_disk=`echo "$1" | sed 's%\([sh]d[a-z]\)[0-9]*$%\1%'` tmp_disk=`echo "$1" | sed 's%\([sh]d[a-z]\)[0-9]*$%\1%'`
tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;; tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;;
gnu*) gnu*)
tmp_disk=`echo "$1" | sed 's%s[0-9]*[a-g]?%%'` 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%%"` ;;
*) *)
echo "grub-install does not support your OS yet." 1>&2 echo "grub-install does not support your OS yet." 1>&2
@ -84,7 +84,7 @@ convert () {
esac esac
# Get the drive name. # Get the drive name.
tmp_drive=`grep -v '^#' $device_map | grep "$tmp_disk" \ tmp_drive=`grep -v '^#' $device_map | grep "$tmp_disk *$" \
| sed 's%.*\(([hf]d[0-9][a-g0-9,]*)\).*%\1%'` | sed 's%.*\(([hf]d[0-9][a-g0-9,]*)\).*%\1%'`
# If not found, print an error message and exit. # If not found, print an error message and exit.
@ -100,14 +100,17 @@ convert () {
linux*) linux*)
echo "$tmp_drive" | sed "s%)$%,`expr $tmp_part - 1`)%" ;; echo "$tmp_drive" | sed "s%)$%,`expr $tmp_part - 1`)%" ;;
gnu*) gnu*)
tmp_pc_slice=`echo "$tmp_part" | sed "s%s\([0-9]*\)[a-g]?%\1%"` if echo $tmp_part | grep "^s" >/dev/null; then
tmp_bsd_partition=`echo "$tmp_part" \ tmp_pc_slice=`echo $tmp_part \
| sed "s%s[0-9]*\([a-g]?\)%\1%"` | sed "s%s\([0-9]*\)[a-g]*$%\1%"`
tmp_drive=`echo "$tmp_drive" \
| sed "s%)%,\`expr "$tmp_pc_slice" - 1\`)%"`
if test "x$tmp_bsd_partition" != x; then
tmp_drive=`echo "$tmp_drive" \ tmp_drive=`echo "$tmp_drive" \
| sed "s%)%,\`sed y%abcdefg%0123456%\`)%"` | sed "s%)%,\`expr "$tmp_pc_slice" - 1\`)%"`
fi
if echo $tmp_part | grep "[a-g]$" >/dev/null; then
tmp_bsd_partition=`echo "$tmp_part" \
| sed "s%[^a-g]*\([a-g]\)$%\1%"`
tmp_drive=`echo "$tmp_drive" \
| sed "s%)%,$tmp_bsd_partition)%"`
fi fi
echo "$tmp_drive" ;; echo "$tmp_drive" ;;
esac esac