From: robertmh <robertmh@localhost>
Date: Sat, 5 May 2007 10:34:05 +0000 (+0000)
Subject: 2007-05-05  Robert Millan  <rmh@aybabtu.com>
X-Git-Tag: 1.98~1862
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c48f23ef4b2614acdc4b60af0de53e4cf035ec2d;p=thirdparty%2Fgrub.git

2007-05-05  Robert Millan  <rmh@aybabtu.com>

	* util/grub.d/10_linux.in: Allow the administrator to insert Linux
	command-line arguments via ${GRUB_CMDLINE_LINUX}.
---

diff --git a/ChangeLog b/ChangeLog
index 4301f7410..ee4e743ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-05  Robert Millan  <rmh@aybabtu.com>
+
+	* util/grub.d/10_linux.in: Allow the administrator to insert Linux
+	command-line arguments via ${GRUB_CMDLINE_LINUX}.
+
 2007-05-05  Robert Millan  <rmh@aybabtu.com>
 
 	* conf/i386-pc.rmk (grub_setup_SOURCES): Add partmap/gpt.c.
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 97c70d1d0..1d7d41575 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -33,7 +33,7 @@ for linux in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
   basedir=`echo $linux | sed -e "s,/[^/]*$,,g"`
   cat << EOF
 menuentry "${OS}, linux ${version}" {
-	linux	${linux} root=${GRUB_DEVICE} ro
+	linux	${linux} root=${GRUB_DEVICE} ro ${GRUB_CMDLINE_LINUX}
 EOF
   if test -e ${basedir}/initrd.img-${version} ; then
     echo "Found initrd image: ${basedir}/initrd.img-${version}" >&2
@@ -46,7 +46,7 @@ EOF
 EOF
   cat << EOF
 menuentry "${OS}, linux ${version} (single-user mode)" {
-	linux	${linux} root=${GRUB_DEVICE} ro single
+	linux	${linux} root=${GRUB_DEVICE} ro single ${GRUB_CMDLINE_LINUX}
 EOF
   if test -e ${basedir}/initrd.img-${version} ; then
     cat << EOF