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

2007-05-20 Robert Millan <rmh@aybabtu.com>

Browse source 
* util/update-grub_lib.in: New file.
	* DISTLIST: Add update-grub_lib.in.
	* conf/common.rmk: Generate update-grub_lib and install it in
	$(lib_DATA).
	* Makefile.in: Add install routine for $(lib_DATA).

	* util/grub.d/00_header.in: Use convert_system_path_to_grub_path()
	function provided by update-grub_lib to support arbitrary paths of
	unifont.pff.
	* util/update-grub.in: Use convert_system_path_to_grub_path() to
	initialize GRUB_DRIVE_BOOT and GRUB_DRIVE_BOOT_GRUB variables.
This commit is contained in:
robertmh 2007-05-20 09:10:06 +00:00
parent 5beb22914d
commit 42c71976c6
7 changed files with 100 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St - Suite 330, Boston, MA 02110, USA.
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
# for convert_system_path_to_grub_path()
. ${libdir}/grub/update-grub_lib
if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi
if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
@ -27,13 +33,19 @@ set timeout=${GRUB_TIMEOUT}
set root=${GRUB_DRIVE}
EOF
if test -e /boot/grub/unifont.pff ; then
cat << EOF
# 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 ; then
grub_path=`convert_system_path_to_grub_path $i`
cat << EOF
font ${GRUB_DRIVE_BOOT_GRUB}/unifont.pff
font ${grub_path}
set gfxmode=640x480
insmod gfxterm
insmod vbe
terminal gfxterm
EOF
fi
break
fi
done

16
util/update-grub.in
View file

@ -22,6 +22,7 @@ transform="@program_transform_name@"
prefix=@prefix@
exec_prefix=@exec_prefix@
sbindir=@sbindir@
libdir=@libdir@
sysconfdir=@sysconfdir@
grub_prefix=`echo /boot/grub | sed ${transform}`
grub_cfg=${grub_prefix}/grub.cfg
@ -30,6 +31,9 @@ update_grub_dir=${sysconfdir}/grub.d
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
# for convert_system_path_to_grub_path()
. ${libdir}/grub/update-grub_lib
if [ "x$UID" = "x" ] ; then
UID=`id -u`
fi
@ -76,18 +80,10 @@ GRUB_FS="`grub-probe --target=fs /`"
GRUB_DRIVE="`grub-probe --target=drive /`"
# GRUB path to /boot
if [ "x`stat -c %d /`" = "x`stat -c %d /boot/`" ] ; then
GRUB_DRIVE_BOOT="${GRUB_DRIVE}/boot"
else
GRUB_DRIVE_BOOT="`grub-probe --target=drive /boot`"
fi
GRUB_DRIVE_BOOT="`convert_system_path_to_grub_path /boot`"
# GRUB path to /boot/grub
if [ "x`stat -c %d /boot`" = "x`stat -c %d /boot/grub`" ] ; then
GRUB_DRIVE_BOOT_GRUB="${GRUB_DRIVE_BOOT}/grub"
else
GRUB_DRIVE_BOOT_GRUB="`grub-probe --target=drive /boot/grub`"
fi
GRUB_DRIVE_BOOT_GRUB="`convert_system_path_to_grub_path /boot/grub`"
if test -f ${sysconfdir}/default/grub ; then
. ${sysconfdir}/default/grub

49
util/update-grub_lib.in Normal file
View file

@ -0,0 +1,49 @@
# Helper library for update-grub
# Copyright (C) 2007 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St - Suite 330, Boston, MA 02110, USA.
transform="@program_transform_name@"
sbindir=@sbindir@
grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
convert_system_path_to_grub_path ()
{
dir=$1
dir=`readlink -f $dir`
drive=`${grub_probe} -t drive $dir`
if [ "x$drive" = "x" ] ; then
return 1
fi
num=`stat -c %d $dir`
relative_path=""
while : ; do
parent=`echo $dir | sed -e "s,/[^/]*$,,g" -e "s,^$,/,g"`
if [ "x`stat -c %d $parent`" = "x$num" ] ; then : ; else
break
fi
if [ "x$dir" = "x/" ] ; then
break
fi
relative_path=`echo $dir | sed -e "s,^.*/,/,g"`$relative_path
dir=$parent
done
echo ${drive}${relative_path}
}