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}.

diff --git a/ChangeLog b/ChangeLog
index d7f91bb4dd03ff94f53c32c6db3eef9cb145d4dd..4ea1fa416ebfb777786cf63a21701346105ab267 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * fs/ntfs.c (grub_ntfs_mount): Fix a memory leak.

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 007c0268c0155de233902989c73bc84aee1ee97f..9ef25cfd75aa2458705bf59fa8481a1e1db584d3 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -33,6 +33,7 @@ done
 
 if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi
 if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
+if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi
 
 cat << EOF
 set default=${GRUB_DEFAULT}
@@ -58,7 +59,7 @@ case x${GRUB_TERMINAL} in
 
     cat << EOF
 if font `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
-  set gfxmode=640x480
+  set gfxmode=${GRUB_GFXMODE}
   insmod gfxterm
   insmod ${video_backend}
   terminal gfxterm

diff --git a/util/update-grub.in b/util/update-grub.in
index 8c60c412f37986cc67da0b438e8cb6ed7ef33c42..75780acb27c3b24c25b9636801be853b893fc1d3 100644 (file)
--- a/util/update-grub.in
+++ b/util/update-grub.in
@@ -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
 
 # 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
 exec > ${grub_cfg}.new