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

add a new option --recheck into grub-install, relieve the check of a device file in grub-install.

Browse source
This commit is contained in:
okuji 2000-10-15 18:24:58 +00:00
parent 84cd6e2879
commit 636299cc50
3 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2000-10-16 OKUJI Yoshinori <okuji@gnu.org>
* util/grub-install.in (convert): Check only if the file exists,
instead of checking if the file is a block device as well.
Because, in a sane operating system, it should be a char device
but not a block device (unlike Linux), and it may be a symbolic
link (this can happen if you use Linux's devfs without devfsd).
(recheck): New variable. Set to "no" by default, and set to
"yes", if you specify the new option ``--recheck''. If $recheck
is "yes", remove the device map file, if present.
2000-10-16 OKUJI Yoshinori <okuji@gnu.org> 2000-10-16 OKUJI Yoshinori <okuji@gnu.org>
From Roderich Schupp: From Roderich Schupp:

3
NEWS
View file

@ -4,6 +4,9 @@ New in 1.0 - XXXX-XX-XX:
* The command "setkey" resets key mappings, when no argument is * The command "setkey" resets key mappings, when no argument is
specified. specified.
* Linux devfs support is added. * Linux devfs support is added.
* The utility ``grub-install'' accepts a new option, `--recheck'. If
this option is specified, probe a device map, even if it already
exists. You should use this option whenever you add/remove a disk.
New in 0.5.96 - 2000-10-04: New in 0.5.96 - 2000-10-04:
* New commands, "reboot" and "halt". * New commands, "reboot" and "halt".

13
util/grub-install.in
View file

@ -36,6 +36,7 @@ grub_prefix=/boot/grub
install_device= install_device=
force_lba= force_lba=
recheck=no
debug=no debug=no
# Usage: usage # Usage: usage
@ -50,8 +51,9 @@ 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.
--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.
INSTALL_DEVICE can be a GRUB device name or a system device filename. INSTALL_DEVICE can be a GRUB device name or a system device filename.
@ -64,7 +66,7 @@ EOF
# This part is OS-specific. # This part is OS-specific.
convert () { convert () {
# First, check if the device file exists. # First, check if the device file exists.
if test -b "$1"; then if test -e "$1"; then
: :
else else
echo "$1: Not found or not a block device." 1>&2 echo "$1: Not found or not a block device." 1>&2
@ -139,6 +141,8 @@ for option in "$@"; do
grub_shell=`echo "$option" | sed 's/--grub-shell=//'` ;; grub_shell=`echo "$option" | sed 's/--grub-shell=//'` ;;
--force-lba) --force-lba)
force_lba="--force-lba" ;; force_lba="--force-lba" ;;
--recheck)
recheck=yes ;;
# This is an undocumented feature... # This is an undocumented feature...
--debug) --debug)
debug=yes ;; debug=yes ;;
@ -197,6 +201,11 @@ fi
test -d "$bootdir" || mkdir "$bootdir" || exit 1 test -d "$bootdir" || mkdir "$bootdir" || exit 1
test -d "$grubdir" || mkdir "$grubdir" || exit 1 test -d "$grubdir" || mkdir "$grubdir" || exit 1
# If --recheck is specified, remove the device map, if present.
if test $recheck = yes; then
rm -f $device_map
fi
# Create the device map file if it is not present. # Create the device map file if it is not present.
if test -f "$device_map"; then if test -f "$device_map"; then
: :