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

Remove GRUB_PREFIX.

Browse source 
* util/grub-mkconfig.in: Remove GRUB_PREFIX.
	* util/grub.d/00_header.in: Compute prefix in the only place it's still
	used for backward compatibility.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 18:21:31 +01:00
parent 22c7ce85fe
commit 47454da510
3 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,11 @@
2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>
Remove GRUB_PREFIX.
* util/grub-mkconfig.in: Remove GRUB_PREFIX.
* util/grub.d/00_header.in: Compute prefix in the only place it's still
used for backward compatibility.
2012-02-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>
Add new all_video module. Add new all_video module.
@ -10,7 +18,7 @@
* grub-core/normal/main.c (features): Add feature_all_video_module. * grub-core/normal/main.c (features): Add feature_all_video_module.
* util/grub.d/00_header.in: Define locale_dir based on $prefix and * util/grub.d/00_header.in: Define locale_dir based on $prefix and
don't do explicit search again. don't do explicit search again.
insmod all_vidoe in load_video if available. insmod all_video in load_video if available.
2012-02-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-25 Vladimir Serbinenko <phcoder@gmail.com>

7
util/grub-mkconfig.in
View file

@ -42,8 +42,6 @@ self=`basename $0`
grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`" grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"
grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`" grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
. "${pkgdatadir}/grub-mkconfig_lib" . "${pkgdatadir}/grub-mkconfig_lib"
# Usage: usage # Usage: usage
@ -126,8 +124,6 @@ else
exit 1 exit 1
fi fi
mkdir -p ${GRUB_PREFIX}
# Device containing our userland. Typically used for root= parameter. # Device containing our userland. Typically used for root= parameter.
GRUB_DEVICE="`${grub_probe} --target=device /`" GRUB_DEVICE="`${grub_probe} --target=device /`"
GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
@ -174,8 +170,7 @@ export GRUB_DEVICE \
GRUB_DEVICE_BOOT_UUID \ GRUB_DEVICE_BOOT_UUID \
GRUB_FS \ GRUB_FS \
GRUB_FONT \ GRUB_FONT \
GRUB_PRELOAD_MODULES \ GRUB_PRELOAD_MODULES
GRUB_PREFIX
# These are optional, user-defined variables. # These are optional, user-defined variables.
export GRUB_DEFAULT \ export GRUB_DEFAULT \

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

@ -129,25 +129,24 @@ if [ "x$gfxterm" = x1 ]; then
cat << EOF cat << EOF
if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then
EOF EOF
else else
for dir in ${pkgdatadir} ${GRUB_PREFIX} /usr/share/grub ; do for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /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
font_path=${path} font_path="${path}"
else else
continue continue
fi fi
break 2 break 2
done
done done
if [ -n "${font_path}" ] ; then done
if [ -n "${font_path}" ] ; then
cat << EOF cat << EOF
if [ x\$feature_default_font_path = xy ] ; then if [ x\$feature_default_font_path = xy ] ; then
font=unicode font=unicode
else else
EOF EOF
# Make the font accessible # Make the font accessible
prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"` prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"`
cat << EOF cat << EOF