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

2007-06-06 Robert Millan <rmh@aybabtu.com>

Browse source 
* util/update-grub_lib.in (convert_system_path_to_grub_path): Abort if
	file doesn't exist, or if it is in a filesystem grub can't read.

	* util/update-grub.in: Set fallback for GRUB_FS check to "unknown".  Do
	not abort if GRUB_DRIVE could not be defined.  Rearrange generated
	header comment to fit in 80 columns when the variables are resolved.

	* util/grub.d/00_header.in: Only set root variable when GRUB_DRIVE
	could be identified by update-grub.  Remove redundant check for
	unifont.pff existance (since convert_system_path_to_grub_path now
	handles that).
This commit is contained in:
robertmh 2007-06-06 18:08:56 +00:00
parent fb36dc2693
commit c0f90770b8
4 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
util/grub.d/00_header.in
View file

@ -30,13 +30,18 @@ if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
cat << EOF
set default=${GRUB_DEFAULT}
set timeout=${GRUB_TIMEOUT}
EOF
if [ "x${GRUB_DRIVE}" = "x" ] ; then : ; else
cat << EOF
set root=${GRUB_DRIVE}
EOF
fi
# Prefer system path for space reasons (/boot/grub might be a very small
# partition in case of OpenFirmware, etc).
for i in /usr/share/grub/unifont.pff /boot/grub/unifont.pff ; do
if test -e $i && grub_path=`convert_system_path_to_grub_path $i` ; then
if grub_path=`convert_system_path_to_grub_path $i` ; then
cat << EOF
font ${grub_path}