From 8124cdb77e131a0c3b649eb88e92939a05d82680 Mon Sep 17 00:00:00 2001 From: robertmh Date: Wed, 30 Apr 2008 11:06:27 +0000 Subject: [PATCH] 2008-04-30 Robert Millan Based on patch from Fabian Greffrath * 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. --- ChangeLog | 7 +++++++ util/grub.d/10_linux.in | 2 +- util/update-grub.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba434cab2..90a4284e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-04-30 Robert Millan + + Based on patch from Fabian Greffrath + * 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 * 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 876d929e7..cd9ff13b5 100644 --- 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 6037b13d8..cb38610f3 100644 --- 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