2008-04-30 Robert Millan <rmh@aybabtu.com>

        Based on patch from Fabian Greffrath <greffrath@leat.rub.de>
        * util/grub.d/10_linux.in: Add ${GRUB_CMDLINE_LINUX_DEFAULT} to the
        first boot option.
        * util/update-grub.in: Export GRUB_CMDLINE_LINUX_DEFAULT.

diff --git a/ChangeLog b/ChangeLog
index ba434cab2b8adad10f9c03f53f2e81d8064ce1c9..90a4284e68e236f2b664285a8b06dcf47a09a46b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-30  Robert Millan  <rmh@aybabtu.com>
+
+       Based on patch from Fabian Greffrath <greffrath@leat.rub.de>
+       * util/grub.d/10_linux.in: Add ${GRUB_CMDLINE_LINUX_DEFAULT} to the
+       first boot option.
+       * util/update-grub.in: Export GRUB_CMDLINE_LINUX_DEFAULT.
+
 2008-04-29  Robert Millan  <rmh@aybabtu.com>
 
        * docs/grub.cfg: New file (example GRUB configuration).

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 876d929e7bf306dc5870438b1e963f6823627d7c..cd9ff13b51e2628ddc613e63942816cb0b710383 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -105,7 +105,7 @@ while [ "x$list" != "x" ] ; do
 
   cat << EOF
 menuentry "${OS}, linux ${version}" {
-       linux   ${grub_dirname}/${basename} root=${GRUB_DEVICE} ro ${GRUB_CMDLINE_LINUX}
+       linux   ${grub_dirname}/${basename} root=${GRUB_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}
 EOF
   if test -n "${initrd}" ; then
     cat << EOF

diff --git a/util/update-grub.in b/util/update-grub.in
index 6037b13d8777672625d85e589ee7f3ba39677546..cb38610f331da1ff2521010b4bc466b60a74afb7 100644 (file)
--- a/util/update-grub.in
+++ b/util/update-grub.in
@@ -158,7 +158,7 @@ esac
 export GRUB_DEVICE GRUB_FS GRUB_DRIVE GRUB_DRIVE_BOOT GRUB_DRIVE_BOOT_GRUB GRUB_FONT_PATH GRUB_PRELOAD_MODULES
 
 # These are optional, user-defined variables.
-export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_TERMINAL GRUB_SERIAL_COMMAND
+export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL GRUB_SERIAL_COMMAND
 
 exec > ${grub_cfg}.new
 chmod 444 ${grub_cfg}.new