Copy/paste description of GRUB_GFXPAYLOAD_LINUX from grub.info.

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

3 files changed, 17 insertions, 7 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 3e51aeb95ac8..1e70629b1bfe 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.319 2014/09/24 21:12:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.320 2014/10/16 04:04:02 floppym Exp $
+
+  16 Oct 2014; Mike Gilbert <floppym@gentoo.org> files/grub.default-3:
+  Copy/paste description of GRUB_GFXPAYLOAD_LINUX from grub.info.
 
   24 Sep 2014; Mike Gilbert <floppym@gentoo.org> grub-2.02_beta2-r2.ebuild:
   Stable on amd64, bug 522314.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 446b0c9f2218..3b5deeab5bae 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -14,7 +14,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 627 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776 SHA512 5ee586c151b025a153867d2854b73e2e18a6af38e9d65069b7114a55af776803ba947b4901b0806e79fa8f36aeac90daad608b9ec2a4a8526301d1beb36e4ef3 WHIRLPOOL fcaef85cd7c2c446c882874cf4ec8a2241d1fc97720973a0a0cd1add259da599d4dae4d0b429ba2dff0307ed2d4598d5939cbc1b11127a0dedb3a54249ec9f81
 AUX grub.default-2 1602 SHA256 d1c11fb4decbae9a9827866ec2126b2c11a3d8f6b41278acad139b4dd34338c5 SHA512 15085cdfe706379d931c6841c34403ffcb46765be75425a29b563d69169124447606d8f8444945ed1148ac734da4f12f14a9b18abd6b0501974c1c770ad13c39 WHIRLPOOL 2f72b2a3d4048261cf3d5477b9a33264b3214a803eebcf4b782c33cf71d045e9be878407c64c720c2a7b260a65f8e32a61974c55ebd8d464e0b947133cdf49fd
-AUX grub.default-3 1871 SHA256 9d5aaa3c4683241e0fe31aaa087674b79dafd8012d1919fcc93285fce4f67397 SHA512 d2232dd961ed8f01be4c133d81764ce883bf83e63fbb0169f8125bea2f335a1b1158822c459c352992be6f865152f3e276738134fca0e6c14af46bb5aeaecfba WHIRLPOOL fcc57050f241f5243caf193840438bfceecaf294dbb53475b92974c6566c1276759e515aef9d727b288d2a2bba5750fb5cea67d66ccdf540039a7743f91a2728
+AUX grub.default-3 2189 SHA256 9632dad421161562dd3f2535f173b6c91741168232d9ef97af894377545e86d4 SHA512 5537884998a3a6f9d1bd926aabd33bd017e953594539dc85791aad0dc5c996e40109092aa9937a7dff34294c17b831c22677a7727c3027bbf7a9e840907893e7 WHIRLPOOL eaa9d50e1884ccde412803c2e939d328d64e469f7d3345057ce71eeebbf1c7e19ff62063323f62c274b306c56884e85e0d134e5c0fcba3254b7c1d25440e9a3a
 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
@@ -29,12 +29,12 @@ EBUILD grub-2.00_p5107-r2.ebuild 8180 SHA256 1db3f6266e63332ef89d9c32895189fee33
 EBUILD grub-2.02_beta2-r2.ebuild 8369 SHA256 a642f1d89a6ccf56ef108a0b155258e33a4d40a6247832a4604a4c1b109012ac SHA512 d4ff246cea719df609eab9f17d5b9d16a84cfc5d931ce2d53bd696ee08576bc506f4bf37e23cb6c6046acd534b49af41b5972533067663918db4797426ff3f32 WHIRLPOOL 8b088f40c6cd9cc2451c123fe1f660005792209c83c946b4af91719c4dee04a3eff33c2f0498db985040663c56f6cdf05d49794d1518965efe11465cd52ccf05
 EBUILD grub-2.02_beta2.ebuild 8304 SHA256 7c41c4abbb6daef697960d00f9f44f2779095b4918ac975c97799c0fd38b958f SHA512 07ee0e1605e12899d5544db3e3672d4c91f7dcc6b65556d27c32ab1edf9a39a183a6b7be6eeb4ad1f5c4be84dee3a0e18af90867241069c253e4be7185163f54 WHIRLPOOL dc310d7dbea7e310da6f7ee3b1f0563014cba9102f325603cf7d3f7ce6047a93fa4f50777e3b86097c04a372c659eb12ab06ded3293585b0c87c74872c31b5fc
 EBUILD grub-9999-r1.ebuild 8306 SHA256 6606fb1f324649428d4d25562718f211d8938a07c46ad89d6016934fec545716 SHA512 dc2c6ff2f85ddb1a2e91eca66ca726e51d981b9ac1b7cf869d966260fd3d1fb8600d7f19ce69e3874c37c37c060cf8b4781e40a3206a50ad6845254ec1d255be WHIRLPOOL 44fd6978a3539bdafa26252ec0788c7d55392f7ba439a9ba0b23c09b8145cefeae8bc1b5bc9fd722bf9c9f46a6b6b34cf4df611229b350dd7550e45f4bdaf48c
-MISC ChangeLog 61070 SHA256 88aa28dd95ad9ee1d3935ce99c48aeda2c8112145c5e700fc3be984e6fdac984 SHA512 53b2c44a0d1b07169dfea69e4a27cefae5ee1655410ce4f759c296a7da2464e7531b020d248a28016cced0ed3588df8a9a386a13b7aa4ac0c358fe349768497d WHIRLPOOL bf48a822a189e35ef7a4277ebf8a99b941b90f6ba571fd6cad29c9f01acf53b5f95b81a04ad5186f952f5bb61d964ac0f85c5b719bb421a171aa6d92aadddda5
+MISC ChangeLog 61208 SHA256 ed8580221895f6ade4c3df84dde57499cb40a096d2f9b9d7dc264149c64d2a31 SHA512 b3b76ef2e8ed1a4943569e97ba5b6d14518f5ad5be42105a89afefc70f26c49f697060b628f2001843c5c4b9a6280224ed47d91817e2b46872f316f506901100 WHIRLPOOL 10f0e6087ca3aa19a2c0b933a409bca56e7c61e39bfe1848ad35844c32a876303eeb7bb6c9a6b1eda0801cb94103a51f378ac6cbc31cf949d1934232f525a15f
 MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQjM6QACgkQC77qH+pIQ6QzDAD+LJPTJ39BcJXrP77quQWRU38E
-oQFWGmFFVPJ2ypKP8T8A/2oKjZRjcJNeD+4Dm4//GnCskQbQzHcv2iMdv0cwmztC
-=Bxa1
+iF4EAREIAAYFAlQ/Q7YACgkQC77qH+pIQ6R60gD/b1s4P0P/5NkzLC+WTh1+98Zh
+XgDCJfvZsh8zDLB2mMAA+gNG7W+omnBlRBD9wk5LURlf2H/CVDeRvHVKCHtCyt52
+=xpLw
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub.default-3 b/sys-boot/grub/files/grub.default-3
index 8f0549d1c27e..f3f7e4764c95 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
 # 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.3 2014/09/10 14:38:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $
 #
 # To populate all changes in this file you need to regenerate your
 # grub configuration file afterwards:
@@ -40,6 +40,13 @@ GRUB_DISTRIBUTOR="Gentoo"
 # You can see them in real GRUB with the command `vbeinfo'.
 #GRUB_GFXMODE=640x480
 
+# Set to 'text' to force the Linux kernel to boot in normal text
+# mode, 'keep' to preserve the graphics mode set using
+# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
+# graphics mode, or a sequence of these separated by commas or
+# semicolons to try several modes in sequence.
+#GRUB_GFXPAYLOAD_LINUX=
+
 # 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.