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

* util/grub-mkconfig.in: Use new variable.

Browse source
This commit is contained in:
Yves Blusseau 2010-09-08 17:21:32 +02:00
parent d87aedff34
commit b9fe6ea2ea
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-09-08 Yves Blusseau <blusseau@zetam.org>
* util/grub-mkconfig.in: Use new variable.
2010-09-08 Yves Blusseau <blusseau@zetam.org> 2010-09-08 Yves Blusseau <blusseau@zetam.org>
* configure.ac: Define some useful variables. * configure.ac: Define some useful variables.

16
util/grub-mkconfig.in
View file

@ -38,6 +38,8 @@ self=`basename $0`
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.
usage () { usage () {
@ -93,18 +95,6 @@ done
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/grub/grub-mkconfig_lib
case "$host_os" in
netbsd* | openbsd*)
# Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub
# instead of /boot/grub.
GRUB_PREFIX=`echo /grub | sed ${transform}`
;;
*)
# Use /boot/grub by default.
GRUB_PREFIX=`echo /boot/grub | sed ${transform}`
;;
esac
if [ "x$EUID" = "x" ] ; then if [ "x$EUID" = "x" ] ; then
EUID=`id -u` EUID=`id -u`
fi fi
@ -200,7 +190,7 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do
exit 1 exit 1
fi fi
else else
for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do for dir in ${pkgdatadir} ${GRUB_PREFIX} /usr/share/grub ; do
for basename in unicode unifont ascii; do for basename in unicode unifont ascii; do
path="${dir}/${basename}.pf2" path="${dir}/${basename}.pf2"
if is_path_readable_by_grub ${path} > /dev/null ; then if is_path_readable_by_grub ${path} > /dev/null ; then