Document options to disable the submenu and play a tone on startup. Bug 544154.

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

3 files changed, 23 insertions, 8 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 5554c4f87676..f9547f7af6fa 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.352 2015/03/17 18:51:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.353 2015/03/25 01:58:00 floppym Exp $
+
+  25 Mar 2015; Mike Gilbert <floppym@gentoo.org> files/grub.default-3:
+  Document options to disable the submenu and play a tone on startup. Bug
+  544154.
 
   17 Mar 2015; Mike Gilbert <floppym@gentoo.org> grub-2.02_beta2-r3.ebuild,
   grub-2.02_beta2-r7.ebuild, grub-9999-r1.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 730e2f7d3504..f6ce0c4039df 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -5,7 +5,7 @@ AUX grub-2.00-freetype-2.5.1.patch 752 SHA256 95ddb348097df2bdf51a36529935118ad4
 AUX grub-2.02_beta2-libzfs.patch 612 SHA256 f2de3680168e7a88261ac3f0fab6131ad3e22ce732ce969c0dc0efbf583aaddb SHA512 17810d390c90e39df63121af4d8dd670a87703d3f589aa26edde7c7e9f8f6e88dfb93a156040062c6cfe03615126970b3b073d688b3ec52cfb6ae401ad31754c WHIRLPOOL 0f19a0684b04bd7494068686fb6596a5f7c4a2e1dc47edb21c4841342876414b5caf367c0cb777e1b42f82e8db1d8eccb20151f89c36da7050aeb9db1616ad4f
 AUX grub.conf.gentoo 591 SHA256 e656b5716d6a5904a035960b460494431d8c1327df51fcd9ffb39243425fe142 SHA512 23036b9e558b604082d9ae8c848f18ea552181416937e3ef62287e53c38086b8d7ffef0e67d04af04f05f5b23c6da7aaf1f1f23e0ee1cffd5dbd5320e8648cb1 WHIRLPOOL 184284cac00bc039d36c5b2f8d7be0f425e75ba904c4c04c2ec531a094cd191c42cb7382276e73a5d176e1661dcdd1bdc5e3806b9d7abe9b38563575ecb6ee76
 AUX grub.default-2 1602 SHA256 d1c11fb4decbae9a9827866ec2126b2c11a3d8f6b41278acad139b4dd34338c5 SHA512 15085cdfe706379d931c6841c34403ffcb46765be75425a29b563d69169124447606d8f8444945ed1148ac734da4f12f14a9b18abd6b0501974c1c770ad13c39 WHIRLPOOL 2f72b2a3d4048261cf3d5477b9a33264b3214a803eebcf4b782c33cf71d045e9be878407c64c720c2a7b260a65f8e32a61974c55ebd8d464e0b947133cdf49fd
-AUX grub.default-3 2189 SHA256 9632dad421161562dd3f2535f173b6c91741168232d9ef97af894377545e86d4 SHA512 5537884998a3a6f9d1bd926aabd33bd017e953594539dc85791aad0dc5c996e40109092aa9937a7dff34294c17b831c22677a7727c3027bbf7a9e840907893e7 WHIRLPOOL eaa9d50e1884ccde412803c2e939d328d64e469f7d3345057ce71eeebbf1c7e19ff62063323f62c274b306c56884e85e0d134e5c0fcba3254b7c1d25440e9a3a
+AUX grub.default-3 2642 SHA256 0258e52ff131449a62112b06844bf53c840ed7bc832ccbb7acd92069d013e429 SHA512 48c67319a2e8b27660d6130aa1a9914a8372e0cc286cba1dd43ea84a8ceebadf3234bcd6488587d40fc397288b8cc35a3e6a5707776d1ceef629226cf8a846d6 WHIRLPOOL b6946830f7b566ab7d752bbd17c6689f93e78fae71840d1fe89bc1a60cfbacd4a89d7ccf071ccc46b1917b2f054eb68f9d888dd5304a41314bed4d4f1200f721
 DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82
 DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
 DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
@@ -24,12 +24,12 @@ EBUILD grub-2.02_beta2-r3.ebuild 8022 SHA256 1363b8870e85fa5e2569785460c0fb81436
 EBUILD grub-2.02_beta2-r6.ebuild 8284 SHA256 886077b9af10ce6a7d03c6590b00105ccb73cad08baf24ccc162da560e81e722 SHA512 e1fca4b5fe6f38cbe89d29d0ee73160c5d58f1fe23191692d1463084c442fddc9c12ffb4c3d9a04016c8c5f661e3afcb29d692cd46703493c8d27b2ad3ed8a7e WHIRLPOOL 9016f5b161773cf9f3b012111e2b009d895488a27ee981484f12ac180b66a798251545ea658f24895ff0333ec9efa1c9f21b57e3ea70105d31ad4702563c4cbe
 EBUILD grub-2.02_beta2-r7.ebuild 8350 SHA256 54a04d52bbe806c497485f07e24cd3ae9eb2d39263848084d2244a943fd7faa4 SHA512 7f3298b50a0c77b9eeb39668982093e420b98f36060851effa48b14c0b8c32c64a9461b80aaacb1beabb892fc1c48aec95f72621bc039841fadfc390987db767 WHIRLPOOL b764465f3df4cdb39fe0d561b6f919ad5d8a2fe965c71063957840e4a5e36740b0d2a8bf011fc2be092a2f33dcd9b14c0701b0cc2250ed5fa9654bcd9e09ca7c
 EBUILD grub-9999-r1.ebuild 8055 SHA256 5b8b8f85d19e831c9c21a083bfe981ff4eeaf1c3bf3fe3131fce462bfec19e01 SHA512 c1e1d64a91464e7bbda050b6c78b6bce3a50343af412fee486ecad050de62296e56adaf486fb9df5edd021f8bfcee1736959d5ad0931a5cf4b515d157dd5a586 WHIRLPOOL 376b7819308fb04d7ed107658e611711a396a984b825917caf58c236122c7a75599c5a6656f9393be4212291ba69451398558aa98d7df407259287a11d0bb51e
-MISC ChangeLog 67482 SHA256 0cb47be2ef7020c207ebaac24f1fafc00bb0411d960bcedce3ae942ff3fa0223 SHA512 88db039d1cf4c020a6b21d233ad7df2e4cf5e4b53586e0fbe45ea021791f0df2d57e9ecf20c93ff3b4f6ec1a4a421226836f5f0b3a39478ed83229cd8349c236 WHIRLPOOL fc6a7f4d4f290d9bcf3ceac9576f897e816ed7dceb310e33f1e955023eda10b4baccedfb0ecd8de6e7c0b82462dbc943a8d3bb5496453c92875248ea2d7afabc
+MISC ChangeLog 67638 SHA256 6441b9dec65bd064cf960ccf4360ad6594e8fa1eced77ae738735298f7ec7ccf SHA512 1e9a6c242abebc669a837b31a8e72e298a695ca4bba5b7f4b6ccd08f6988f6b3d7c21b5e73f8b808f6422900aecadd7cee6b281ae531df19482b604493813f44 WHIRLPOOL b3c882f977cf51b19a93a2219aa189762ee3d51f9860cc8f8cfa3ca05c64fe635b93baccfe8e8142fc7aaa686b9c62020da0222e482b6a348c3f6b017c7947b8
 MISC metadata.xml 1099 SHA256 11bf295d5e9c29b235f08aee8426c0bed0d13e784242d9a0ed85a8785418c0fb SHA512 ed5ba243b98e32e0f4aa7bc7f116219add21bc2d4a60e38df6681cbdc9f4894507f6bc94d6092af777d5020c6a93ac6e8b5088e291b80b2a92294b4a8b69e121 WHIRLPOOL 07ac627189c56533d3484cd318610a18dde5cf732959fcbc405873a5146de96a49d8b29f6e2c2ec15fe62b561952361a4e0092aa17b744f761a500a40245c8fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUId8cACgkQC77qH+pIQ6RN8gD/cRclQG3AN+REmPdxpIjznpvr
-e6Nue7zIyfcd9cIsdowA/jBVzhvOHIfvHJg9zH+UmFrGVPpuqT6ezl0Dklm6/4li
-=yyFT
+iF4EAREIAAYFAlUSFikACgkQC77qH+pIQ6RPvQEArzv/cIL6Juanped1TzLBvJBm
+lkZ6Nz7fyzm6IgwN4I8A/099IgpakOdM2pm7TogWhpR/QuesNuVLVB6D9UXrUWI8
+=sBem
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub.default-3 b/sys-boot/grub/files/grub.default-3
index f3f7e4764c95..8ff053fa7b35 100644
--- a/sys-boot/grub/files/grub.default-3
+++ b/sys-boot/grub/files/grub.default-3
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.4 2014/10/16 04:04:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $
 #
 # To populate all changes in this file you need to regenerate your
 # grub configuration file afterwards:
@@ -61,3 +61,14 @@ GRUB_DISTRIBUTOR="Gentoo"
 
 # Uncomment to disable generation of recovery mode menu entries
 #GRUB_DISABLE_RECOVERY=true
+
+# Uncomment to disable generation of the submenu and put all choices on
+# the top-level menu.
+# Besides the visual affect of no sub menu, this makes navigation of the
+# menu easier for a user who can't see the screen.
+#GRUB_DISABLE_SUBMENU=y
+
+# Uncomment to play a tone when the main menu is displayed.
+# This is useful, for example, to allow users who can't see the screen
+# to know when they can make a choice on the menu.
+#GRUB_INIT_TUNE="60 800 1"