Adjust default menu options for grub-2.02.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 57 insertions, 5 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index beb571492f3c..572cf98c3304 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # 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.297 2013/12/19 03:25:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.298 2013/12/19 14:57:24 floppym Exp $
+
+  19 Dec 2013; Mike Gilbert <floppym@gentoo.org> +files/grub.default-3,
+  grub-2.02_beta1.ebuild, grub-9999-r1.ebuild:
+  Adjust default menu options for grub-2.02.
 
 *grub-2.02_beta1 (19 Dec 2013)
 
diff --git a/sys-boot/grub/files/grub.default-3 b/sys-boot/grub/files/grub.default-3
new file mode 100644
index 000000000000..cca096b83581
--- /dev/null
+++ b/sys-boot/grub/files/grub.default-3
@@ -0,0 +1,48 @@
+# 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-3,v 1.1 2013/12/19 14:57:24 floppym Exp $
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+#     'grub2-mkconfig -o /boot/grub/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values. 
+
+GRUB_DISTRIBUTOR="Gentoo"
+
+# Default menu entry
+#GRUB_DEFAULT=0
+
+# Boot the default entry this many seconds after the menu is displayed
+#GRUB_TIMEOUT=5
+#GRUB_TIMEOUT_STYLE=menu
+
+# 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
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+#GRUB_GFXMODE=640x480
+
+# Path to theme spec txt file.
+# The starfield is by default provided with use truetype.
+# NOTE: when enabling custom theme, ensure you have required font/etc.
+#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+#GRUB_BACKGROUND="/boot/grub/mybackground.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY=true
diff --git a/sys-boot/grub/grub-2.02_beta1.ebuild b/sys-boot/grub/grub-2.02_beta1.ebuild
index 8ccedb25ee05..ff4a5bee3e4e 100644
--- a/sys-boot/grub/grub-2.02_beta1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta1.ebuild,v 1.1 2013/12/19 03:25:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta1.ebuild,v 1.2 2013/12/19 14:57:24 floppym Exp $
 
 EAPI=5
 
@@ -278,7 +278,7 @@ src_install() {
 	fi
 
 	insinto /etc/default
-	newins "${FILESDIR}"/grub.default-2 grub
+	newins "${FILESDIR}"/grub.default-3 grub
 
 	cd "${ED}" || die
 	pax-mark mpes $(scanelf -BF %F usr/{bin,sbin})
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 4f9b615aaa71..818cf209ba35 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.7 2013/12/19 03:25:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.8 2013/12/19 14:57:24 floppym Exp $
 
 EAPI=5
 
@@ -278,7 +278,7 @@ src_install() {
 	fi
 
 	insinto /etc/default
-	newins "${FILESDIR}"/grub.default-2 grub
+	newins "${FILESDIR}"/grub.default-3 grub
 
 	cd "${ED}" || die
 	pax-mark mpes $(scanelf -BF %F usr/{bin,sbin})