[1825] 2008-08-22 Felix Zielcke <[email protected]>

Revision: 1825
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1825
Author:   fzielcke
Date:     2008-08-22 12:58:46 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
2008-08-22  Felix Zielcke  <[email protected]>

	* util/update-grub.in (GRUB_GFXMODE): Export variable.
	* util/grub.d/00_header.in: Allow the administrator to change default
	gfxmode via ${GRUB_GFXMODE}.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub.d/00_header.in
    trunk/grub2/util/update-grub.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2008-08-21 13:30:32 UTC (rev 1824)
+++ trunk/grub2/ChangeLog	2008-08-22 12:58:46 UTC (rev 1825)
@@ -1,3 +1,9 @@
+2008-08-22  Felix Zielcke  <[email protected]>
+         
+	* 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  <[email protected]>
 
 	* fs/ntfs.c (grub_ntfs_mount): Fix a memory leak.

Modified: trunk/grub2/util/grub.d/00_header.in
===================================================================
--- trunk/grub2/util/grub.d/00_header.in	2008-08-21 13:30:32 UTC (rev 1824)
+++ trunk/grub2/util/grub.d/00_header.in	2008-08-22 12:58:46 UTC (rev 1825)
@@ -33,6 +33,7 @@
 
 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 @@
 
     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

Modified: trunk/grub2/util/update-grub.in
===================================================================
--- trunk/grub2/util/update-grub.in	2008-08-21 13:30:32 UTC (rev 1824)
+++ trunk/grub2/util/update-grub.in	2008-08-22 12:58:46 UTC (rev 1825)
@@ -163,7 +163,7 @@
 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