Adjust default menu options for grub-2.02.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 64 insertions, 11 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/Manifest b/sys-boot/grub/Manifest
index 06faf08595ae..6df8170cc2d1 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -24,6 +24,7 @@ AUX grub-2.00-zfs-feature-flag-support.patch 31186 SHA256 596d509a22d1f3c2bf2786
 AUX grub.conf.gentoo 627 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776 SHA512 5ee586c151b025a153867d2854b73e2e18a6af38e9d65069b7114a55af776803ba947b4901b0806e79fa8f36aeac90daad608b9ec2a4a8526301d1beb36e4ef3 WHIRLPOOL fcaef85cd7c2c446c882874cf4ec8a2241d1fc97720973a0a0cd1add259da599d4dae4d0b429ba2dff0307ed2d4598d5939cbc1b11127a0dedb3a54249ec9f81
 AUX grub.default 1254 SHA256 181bdb7433ebcbde635e7058a1febaf0100e4e9c83ea4fd222d7010c375882d8 SHA512 1cdce5d9c606a2cba29ec859df96de9e8c292301ee3f26dff848816cda950088c0660dbd3401eec97b15841a2544116664eeda6cb0be753f6d160a7e62578dbc WHIRLPOOL 03514e95078f4f4d176e85ba3a739105a7cbf58a6c3e2ba4a2c660c48329dcc78b968391ecb2d9821084ba4ddddbe03e41d9d6c36685f1db1d4a1f00a1e5d393
 AUX grub.default-2 1602 SHA256 d1c11fb4decbae9a9827866ec2126b2c11a3d8f6b41278acad139b4dd34338c5 SHA512 15085cdfe706379d931c6841c34403ffcb46765be75425a29b563d69169124447606d8f8444945ed1148ac734da4f12f14a9b18abd6b0501974c1c770ad13c39 WHIRLPOOL 2f72b2a3d4048261cf3d5477b9a33264b3214a803eebcf4b782c33cf71d045e9be878407c64c720c2a7b260a65f8e32a61974c55ebd8d464e0b947133cdf49fd
+AUX grub.default-3 1667 SHA256 3fc917da8f0943a785ed0a0f6cbd04e82eab9798da609a53879b67bccc7a874c SHA512 3891e2539d5dc2e5b1d3c3c6134ebaddd171513e2a2033ae5f777fccd4989f6b2994f8846ad226583cb68239cca9e8e7c39ba61b9837a2fba428b5b60bac5b0e WHIRLPOOL 633c7650d2c0f225b6e02b17a8d29255ca5422f768c8a7e7a58cb695ef5e68d3641cfa58c884c53b981af5b22b5dfdbc3ac1c8c457bbde991ec1a28ba3c12225
 DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82
 DIST grub-0.92-gentoo-0.2.tar.bz2 21727 SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe SHA512 ac90f58913203b970808e3a6e20ce367af1d6a262eba5f229d080c7f5eebd228bd9add9a423d642f8a53d915930921975af1d45116f18bc0be982320b898ef1d WHIRLPOOL 2bbfddab5da2e786047e25d95c0c8c6cb70f5174df5991db3b09657bc15802af81bcb124bf7723fca3c2016eb42d9f06ef2b8500920ae15de3624ae87c8d3d51
 DIST grub-0.92.tar.gz 877112 SHA256 197e690faed45bcbf854ab5dc591053d6f6ed1a5b8e5596c4ba27d6f0d50eb37 SHA512 11750f4dc6606e354acc7f459416f0a2efaedcd6e60ab85c708de0d04eb7876a899292067c651cc857db30a7a533714f21719a9eb65c14aef9306c5187843bee WHIRLPOOL be47d1ff182dc8305d748b2e6bcf0c6796019eb1f59abfb042ad3bb4c0922c25b5420ce8c6bfe2c098ef120088866b9623e85e47902f8441e061a13c65b58ae1
@@ -71,14 +72,14 @@ EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c5
 EBUILD grub-2.00-r4.ebuild 6772 SHA256 567b9c19af55d0687a084eab551197c6bb2b36bc800375f6fc3522b611effb19 SHA512 0a09c35b7e534a772451eb3a3ef8a6333d89abc9b6e3cae4548e4e289fe8104e1282fe7e1ca699a5d2650fb83ae75f06ee732ec13b2d6e509c3311591e654427 WHIRLPOOL ab8e4b5566283f6f07b31022e646863f44b37a8d8bb210bc7db7843220b25cf235599fc458225792afabec5e449e3d72dd005ee75d904b8e62b857e6bf680253
 EBUILD grub-2.00_p5107-r2.ebuild 8080 SHA256 a962749fb4ef3cac0bdbe7faa620380a2d6cb064b37823dc71201dab8356804a SHA512 e29425d7262e5902fd9e87ed6c7e72df15dd670152c6dcd365b5c6e0ee8019599e3314a4cdea867de6acd7d2babcdb66b91535d7ceeb7c58c60ebca9407bb19c WHIRLPOOL 19d522b67db7139193505f93aa5a474e5f88a5d2ee322d7c8283c2c2ad7984bfaf9cbfae6820d125b11b8b0a8b41b049b3ca72e9c60b8f0a4d82653ea791c34e
 EBUILD grub-2.00_p5107.ebuild 6567 SHA256 fecc66f9d1f45a940530ddaf1fc9fcb1c05c2346b1ee8170c3a897d7be5c5fd9 SHA512 7ce9b814878dceb204dbe5a7103517ab451bce414e2075420e234392369b5edd82e499907becdabff456ad3c5ca53ede74dfa7132ed1b33904f44c52fc471cd0 WHIRLPOOL 103d3db1fb21055d69289717bf6acef361cc4fec4e862413f90d047987889d8b248b5c15288977aab2f3df686990dd14f3e6a3cf90da0d3eb0a066f2b773a593
-EBUILD grub-2.02_beta1.ebuild 8210 SHA256 f579296f7d5ad3c3a7219b52409f26837584cd52bf29ebec4f44ae27f0e9e005 SHA512 8185378b884ad08bc6cb74f2f62e171ee24d526802b8649fd45e49864ae1a18b4683ea3af3d1f6eb5a1b1e219b4aefbd7362074eb8a2a4de872c8f0f0e00a03b WHIRLPOOL 5264fd0d5eeb66c0633731dc631de0fdd8ed70d150e54125ecdc7033746e983229a3e6e47d520284c2467773e1ac9b2a1a672022caa2828fff0142d2f9da2b82
-EBUILD grub-9999-r1.ebuild 8207 SHA256 9e7e3322bb0f3a3d9623386d9c70638bcfea75ab4eb872f31734b7097e16950a SHA512 3421620a95f33183a0337d370c9c28675966b7ff97db84d8d95e905563bd15dff7505d36ddca65196649a3ce3bb640cc8f54bf972c8e76819699c022c5c33b6f WHIRLPOOL 99e60f07cbd342f16868b8a9e254e43ca7a8ce143f936c549e45f50260c8b63fa571146f2b51603d2e0149b3e0c82bc27517e8a085446c023509aa6101a09151
-MISC ChangeLog 55594 SHA256 a52cec76204767c4d877a37c060771e58f054e6403cd950c00f21b80e7a92ac9 SHA512 f7a88ec558fcae7f6e37d944d5f52f980558d76b744edb841503eccf97af3faf88b03b462c4111371532ed40ee3ffbe57777f2a4e3fc75129a6502ba0317850e WHIRLPOOL 14d0ace35cbbdf34b026c0ed7891f924ffb5520e1ca80babde528bfcba3a8a846dfb74fab887214790a58b6cde0f938d1936ef4957b039d02729b3a912c4c021
+EBUILD grub-2.02_beta1.ebuild 8210 SHA256 681abed5fa1585195b85b332089ca7f875422eb4c3f8a0bb9f06717723667dc9 SHA512 43a147d7ae4d9ad88400c46fc08a4675adea36b67bf365fcd8b69577ca7ec39678995afadd3a2e449bd59f23defee82d161b15a85bb8d273355dc1768590c937 WHIRLPOOL a3e24781afdfd7557867f0fc18f1d777a06067158c20d9342e791b6379e16dbebd45bb10f2dfc83efc4103c89d622e50ed4703a94ec9f364e8c7211827a5f733
+EBUILD grub-9999-r1.ebuild 8207 SHA256 3a2260774e37e24f118cf9575baf20ba2eee55e9b2664285df019de23caade1d SHA512 e8080e872dfe96cacc4c33ab5cfd8c69fe7f1600f6061f39680c7e016c9badb2a049b2ce438c20b59083e405f07aefc81edec61c0036cf49f5bd220de1a89de1 WHIRLPOOL 994e64896708da5d0b3375bc26870c4592dad0965da8b461375cc4a2421ffbc0fd7c6486ea2dc193e6f1248a598690646526c672f5174cec39f02596bcc89877
+MISC ChangeLog 55759 SHA256 7a9daf8084e3305253d78fb756b7c21de4c3a9fada07e88fdeb6e0e57b00b556 SHA512 1e78ac6d668b10b1f2d5724a7f1a3361e72946aa284f235474ef2f861562c0bdfab798c681f0ae981b7f8d74a0e1ea900fdb55f0b06def42383a163dc0da4ec5 WHIRLPOOL 59bef1da285643d4d02f1eb9fa59204da7bf73cde0976ef0451bf41e31b4018e5cf73900d6be97673a14b05d60999726994864c736a6234a0df0960d7ee629fa
 MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKyZywACgkQC77qH+pIQ6R/4QD/emllWDeQHU57OhHZyuHGz9MG
-K6velmoxXre+2usT07gA+QF7XMJP/jvSIfQvvBKsq3OIpVTrQks2Mgf+oSDxB7Vt
-=iIOT
+iF4EAREIAAYFAlKzCVUACgkQC77qH+pIQ6RT3wD8D7vnEdm1fpiJBLKBJWGtCRp/
+cljs8HnyjR5/4Ag2tY4BAMbz4/2YF3A4lZHsS5bDOCHi3S0W7sN49aq+Ap4kuqWZ
+=J9/9
 -----END PGP SIGNATURE-----
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})