2008-08-22 Felix Zielcke <fzielcke@z-51.de>

* util/update-grub.in (GRUB_GFXMODE): Export variable.
	* util/grub.d/00_header.in: Allow the administrator to change default
	gfxmode via ${GRUB_GFXMODE}.
This commit is contained in:
fzielcke 2008-08-22 12:58:46 +00:00
parent 380cfbb458
commit d5a7dc5b74
3 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2008-08-22 Felix Zielcke <fzielcke@z-51.de>
* util/update-grub.in (GRUB_GFXMODE): Export variable.
* util/grub.d/00_header.in: Allow the administrator to change default
gfxmode via ${GRUB_GFXMODE}.
2008-08-21 Felix Zielcke <fzielcke@z-51.de> 2008-08-21 Felix Zielcke <fzielcke@z-51.de>
* fs/ntfs.c (grub_ntfs_mount): Fix a memory leak. * fs/ntfs.c (grub_ntfs_mount): Fix a memory leak.

View file

@ -33,6 +33,7 @@ done
if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi
if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi
cat << EOF cat << EOF
set default=${GRUB_DEFAULT} set default=${GRUB_DEFAULT}
@ -58,7 +59,7 @@ case x${GRUB_TERMINAL} in
cat << EOF cat << EOF
if font `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then if font `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
set gfxmode=640x480 set gfxmode=${GRUB_GFXMODE}
insmod gfxterm insmod gfxterm
insmod ${video_backend} insmod ${video_backend}
terminal gfxterm terminal gfxterm

View file

@ -163,7 +163,7 @@ esac
export GRUB_DEVICE GRUB_DEVICE_UUID GRUB_DEVICE_BOOT GRUB_DEVICE_BOOT_UUID GRUB_FS GRUB_FONT_PATH GRUB_PRELOAD_MODULES export GRUB_DEVICE GRUB_DEVICE_UUID GRUB_DEVICE_BOOT GRUB_DEVICE_BOOT_UUID GRUB_FS GRUB_FONT_PATH GRUB_PRELOAD_MODULES
# These are optional, user-defined variables. # These are optional, user-defined variables.
export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID GRUB_GFXMODE
rm -f ${grub_cfg}.new rm -f ${grub_cfg}.new
exec > ${grub_cfg}.new exec > ${grub_cfg}.new