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

fix a floppy handling bug in grub-install.

Browse source
This commit is contained in:
okuji 2000-12-09 10:14:09 +00:00
parent 8593e88271
commit 29aa359512
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-12-09 OKUJI Yoshinori <okuji@gnu.org>
From Leendert Meyer <leen.meyer@home.nl>:
* util/grub-install.in (convert): If a floppy device is
specified, remove everything from $tmp_part.
2000-12-09 OKUJI Yoshinori <okuji@gnu.org> 2000-12-09 OKUJI Yoshinori <okuji@gnu.org>
* lib/device.c [__linux__] (write_to_partition): Use strcpy * lib/device.c [__linux__] (write_to_partition): Use strcpy

1
THANKS
View file

@ -35,6 +35,7 @@ Kalle Olavi Niemitalo <tosi@ees2.oulu.fi>
Khimenko Victor <grub@khim.sch57.msk.ru> Khimenko Victor <grub@khim.sch57.msk.ru>
Klaus Reichl <klaus.reichl@alcatel.at> Klaus Reichl <klaus.reichl@alcatel.at>
Kunihiro Ishiguro <kunihiro@zebra.org> Kunihiro Ishiguro <kunihiro@zebra.org>
Leendert Meyer <leen.meyer@home.nl>
M. Meiarashi <mes@st.rim.or.jp> M. Meiarashi <mes@st.rim.or.jp>
Mark Lundeberg <aa026@pgfn.bc.ca> Mark Lundeberg <aa026@pgfn.bc.ca>
Matt Yourst <yourst@mit.edu> Matt Yourst <yourst@mit.edu>

2
util/grub-install.in
View file

@ -80,6 +80,8 @@ convert () {
-e 's%/part[0-9]*$%/disc%'` -e 's%/part[0-9]*$%/disc%'`
tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \ tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
-e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%'` -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%'`
# floppy drives don't have partitions:
tmp_part=`echo "$tmp_part" | sed -e 's%.*/fd[0-9]*%%'`
;; ;;
gnu*) gnu*)
tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'` tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`