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

added --no-floppy option to grub-install

Browse source
This commit is contained in:
jthomas 2003-08-01 01:26:49 +00:00
parent 61b109a5ca
commit 00cdabfa51
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2003-08-01 Jason Thomas <jason@intology.com.au>
* util/grub-install.in: support --no-floppy
This allow users to specify the --no-floppy option which
is passed onto the grub shell, so it does not probe the floppy
drive.
Patch from kesha@diedas.soften.ktu.lt
2003-06-17 Jochen Hoenicke <jochen@gnu.org> 2003-06-17 Jochen Hoenicke <jochen@gnu.org>
* stage2/fsys_reiserfs.c (reiserfs_mount): Clear the node cache. * stage2/fsys_reiserfs.c (reiserfs_mount): Clear the node cache.

10
util/grub-install.in
View file

@ -36,6 +36,7 @@ rootdir=
grub_prefix=/boot/grub grub_prefix=/boot/grub
install_device= install_device=
no_floppy=
force_lba= force_lba=
recheck=no recheck=no
debug=no debug=no
@ -64,6 +65,7 @@ Install GRUB on your drive.
--root-directory=DIR install GRUB images under the directory DIR --root-directory=DIR install GRUB images under the directory DIR
instead of the root directory instead of the root directory
--grub-shell=FILE use FILE as the grub shell --grub-shell=FILE use FILE as the grub shell
--no-floppy do not probe any floppy drive
--force-lba force GRUB to use LBA mode even for a buggy --force-lba force GRUB to use LBA mode even for a buggy
BIOS BIOS
--recheck probe a device map even if it already exists --recheck probe a device map even if it already exists
@ -221,6 +223,8 @@ for option in "$@"; do
rootdir=`echo "$option" | sed 's/--root-directory=//'` ;; rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
--grub-shell=*) --grub-shell=*)
grub_shell=`echo "$option" | sed 's/--grub-shell=//'` ;; grub_shell=`echo "$option" | sed 's/--grub-shell=//'` ;;
--no-floppy)
no_floppy="--no-floppy" ;;
--force-lba) --force-lba)
force_lba="--force-lba" ;; force_lba="--force-lba" ;;
--recheck) --recheck)
@ -312,7 +316,7 @@ else
# Create a safe temporary file. # Create a safe temporary file.
test -n "$mklog" && log_file=`$mklog` test -n "$mklog" && log_file=`$mklog`
$grub_shell --batch --device-map=$device_map <<EOF >$log_file $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
quit quit
EOF EOF
if grep "Error [0-9]*: " $log_file >/dev/null; then if grep "Error [0-9]*: " $log_file >/dev/null; then
@ -395,7 +399,7 @@ for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
count=5 count=5
tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"` tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`
while test $count -gt 0; do while test $count -gt 0; do
$grub_shell --batch --device-map=$device_map <<EOF >$log_file $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
dump ${root_drive}${tmp} ${img_file} dump ${root_drive}${tmp} ${img_file}
quit quit
EOF EOF
@ -420,7 +424,7 @@ rm -f $log_file
test -n "$mklog" && log_file=`$mklog` test -n "$mklog" && log_file=`$mklog`
# Now perform the installation. # Now perform the installation.
$grub_shell --batch --device-map=$device_map <<EOF >$log_file $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
root $root_drive root $root_drive
setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $install_drive setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $install_drive
quit quit