summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-05-13 16:54:13 +0000
committerMike Gilbert <floppym@gentoo.org>2013-05-13 16:54:13 +0000
commitbc0910b194ed8b94d8276a6279184fc6daacb6ce (patch)
tree50f60690edff988e4912885259be4bf621d1014e /sys-boot
parentRevision bump: fix default prefix path, wrt bug #469596, thanks to Alexander ... (diff)
downloadgentoo-2-bc0910b194ed8b94d8276a6279184fc6daacb6ce.tar.gz
gentoo-2-bc0910b194ed8b94d8276a6279184fc6daacb6ce.tar.bz2
gentoo-2-bc0910b194ed8b94d8276a6279184fc6daacb6ce.zip
Describe the GRUB_CMDLINE_LINUX variables.
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog5
-rw-r--r--sys-boot/grub/files/grub.default-211
2 files changed, 11 insertions, 5 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index c2bb4984943a..913f2515b116 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.262 2013/05/01 13:48:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.263 2013/05/13 16:54:13 floppym Exp $
+
+ 13 May 2013; Mike Gilbert <floppym@gentoo.org> files/grub.default-2:
+ Describe the GRUB_CMDLINE_LINUX variables.
01 May 2013; Mike Gilbert <floppym@gentoo.org> grub-9999.ebuild:
Enable mulitslot by default.
diff --git a/sys-boot/grub/files/grub.default-2 b/sys-boot/grub/files/grub.default-2
index 392a3ae20e08..a61ddeb9c6b3 100644
--- a/sys-boot/grub/files/grub.default-2
+++ b/sys-boot/grub/files/grub.default-2
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.2 2012/06/28 22:36:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.3 2013/05/13 16:54:13 floppym Exp $
#
# To populate all changes in this file you need to regenerate your
# grub configuration file afterwards:
@@ -16,8 +16,11 @@ GRUB_HIDDEN_TIMEOUT=0
GRUB_HIDDEN_TIMEOUT_QUIET=true
GRUB_TIMEOUT=10
-GRUB_CMDLINE_LINUX_DEFAULT=""
-GRUB_CMDLINE_LINUX=""
+# Append parameters to the linux kernel command line
+# GRUB_CMDLINE_LINUX=""
+
+# Append parameters to the linux kernel command line for non-recovery entries
+#GRUB_CMDLINE_LINUX_DEFAULT=""
# Uncomment to disable graphical terminal (grub-pc only)
#GRUB_TERMINAL=console