2007-06-06 Robert Millan <rmh@aybabtu.com>
* 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:
parent
fb36dc2693
commit
c0f90770b8
4 changed files with 30 additions and 6 deletions
|
@ -24,6 +24,8 @@ grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
|
|||
convert_system_path_to_grub_path ()
|
||||
{
|
||||
dir=$1
|
||||
# Abort if file doesn't exist
|
||||
test -e $dir
|
||||
dir=`readlink -f $dir`
|
||||
|
||||
drive=`${grub_probe} -t drive $dir`
|
||||
|
@ -31,6 +33,9 @@ convert_system_path_to_grub_path ()
|
|||
return 1
|
||||
fi
|
||||
|
||||
# Abort if file is in a filesystem we can't read
|
||||
${grub_probe} -t fs $dir > /dev/null 2>&1
|
||||
|
||||
num=`stat -c %d $dir`
|
||||
relative_path=""
|
||||
while : ; do
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue