grub: disable load_video (doesn't work well with Gentoo)

5 files changed, 48 insertions, 9 deletions

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index f46c98d..ca9303f 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -3,6 +3,7 @@ AUX 05_distro_theme 1180 RMD160 ee8d8707e07dbf9877be5bbc9322263822d4ddad SHA1 ad
 AUX default-splash-5.4.png 641815 RMD160 175bf793a542654e765fecca89f6c628e7a8a586 SHA1 a8ceabcef3854517d879522ab5155540ddeca3d9 SHA256 f9eedc888fd11d899000397f073d042ce5a4230923966f9d12828263f0a2d14a
 AUX default-splash-6.png 1006813 RMD160 9c00ed318f4b40486289b1bcf9d7d085d5d9c67c SHA1 aea9184f94b7c60deef172e730b5aada5fe209de SHA256 27da12fccce3fc4a40724471b9ebd4c2fed30c743fcd049a4c53963f87e17e24
 AUX default-splash.png 379111 RMD160 c399047d7d63e72495416f0f25cdc4c7bcc38946 SHA1 d0e6e920e4ce973c460d4bb994e4a87e2e32e8aa SHA256 09de78447d236669252b4669a341b5589043466bcb6bbf80e334462024c655c8
+AUX disable_load_video.patch 1008 RMD160 2e8c3c0d798948ffe7080b4c315b604d1326a63b SHA1 73e0f6ad27ae2329753cf2b53faf2e52e7c4a03a SHA256 e6a9752c8f5706a66770ea6994ec1282c8df4b986bb6d5bb9ff1c0dd7cea2ccc
 AUX grub-0.97-gfxmenu-v8.patch 23313 RMD160 ee79292a61a4fcbfa2afe5bea56e56ee4efbfe01 SHA1 b4e567009e61e9bc6a2e60bae3333681c458debc SHA256 c2f7897027842631a95a654e7978d43e6d21d8c06426ff2d966678e3fca0ba4a
 AUX grub-0.97-uuid.patch 144339 RMD160 58816e0fc819a0c5afc2da0024611ec650119be2 SHA1 9b5a0fb112eaf143b8b81f487b3b515a13423372 SHA256 9766e446665a955e2dab10e5e42d83b3384b5e6e306c3eba70a08f35a3fbf129
 AUX grub-0.97-uuid_doc.patch 1364 RMD160 667f9e91ed037cac61a00e2ea4dda5d94ad4369c SHA1 1b12abc7270624c8192bdc692264584eea947e9a SHA256 371ca0229b5036071f418f4ca3d8b724b2ea8719954edadbf4ddfa4e937a089b
@@ -23,8 +24,8 @@ AUX grub-1.99-vga-deprecated.patch 408 RMD160 8b2c8560d8bf39bc06a110eaa81a388c3f
 AUX grub-1.99-wallpaper-settings-support.patch 521 RMD160 5a47c70dfc686a3741f99e4aad475f30c38a6876 SHA1 e70335fb11e92a182462f92866bf31324d070c34 SHA256 d21265645972e57278341cd27b1406f9f630f94cc1722374832cca95453ce807
 AUX grub-1.99-workaround-raid-bios-bug.patch 808 RMD160 749e9eacf6cb9c58274b77720650d77a86cd3604 SHA1 60fde97e779e940207376723535ad523b92a0531 SHA256 011c480d2001e37a8b7a347ddabe072c5c912932deda016badeeb1e57a6f63d6
 AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
-AUX grub2-default 2084 RMD160 1a7ed37eeda753b279c6f6d864d9122d439631da SHA1 c2f697c4c525c50931b8f00864af0a9249c08777 SHA256 df286f514070ba4e4ee70a65f7f68a7103ffba4d230fb1dc99f9667515a9ca16
-AUX grub2-default-1.99 2113 RMD160 2ad38a800e66d7cb904b77e0167f4da51e390b0d SHA1 4b191d88d42e865d3efa882601da52ad6ace62be SHA256 b6e255a0e4127709e92d4049b23295feab6c026e7945b3b0ec4f675d9058a45e
+AUX grub2-default 2081 RMD160 7a30dfee0424b03d00af865962681d8dd06d1cd5 SHA1 b274a4b170db6d3d7058168870d102ccdb5e47d5 SHA256 f5746fc7a98dfc2e4c79657d96d4bcdefee087eb84f8d08cc901c13c3595c27f
+AUX grub2-default-1.99 2110 RMD160 6c770d5f87055e0df77773e2ae67eea3becd2706 SHA1 519e759c182a17bbc3ba6e866141325a48a7d6dc SHA256 47f6768298b7f44500a57b7728ed52bf044a574d320694a6b8cca69d30c79a93
 AUX splash.xpm.gz 6251 RMD160 d7b6f187c45597dab59415163fc9d0c154d40cbe SHA1 3b8615b6e105fcbcd6530b46947e06d480caa8f4 SHA256 46397f66ab9dbb2215d5191d94e6ca5aecb53f84ad70cc17aeb319353ba201b2
 AUX ubuntu-upstream-1.98/01_uuids_and_lvm_dont_play_along_nicely.diff 611 RMD160 0269ad21a4e5723383b2f04670088cc6b1a1e636 SHA1 344e63b80d9e3d057d41bc50e980a1b1c311a426 SHA256 282635fd75266dfe9222afc892f02a9f9fbc227f05556054531fb63704f9cd55
 AUX ubuntu-upstream-1.98/902_boot_blocklist_hack.diff 590 RMD160 12856f69930dc7783cf4184cc431e43d91f83b49 SHA1 941ed1934cf60c3564da010cd975248b92e321f4 SHA256 27466e25257cc267b0048086ae0ad76aa07bd703fa1827342c83b11bff843b84
@@ -50,4 +51,4 @@ DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SH
 EBUILD grub-0.97-r22.ebuild 7588 RMD160 86e8c77ec7ee193919bdec359e53a8236a4b4c77 SHA1 212944ff569048769c15fd6676a63e6eea4c0cef SHA256 ff5b303cedd5a05c39f8903fbfb215512ab58f12ff023773d739eb3fa244f8bd
 EBUILD grub-1.98-r10.ebuild 3654 RMD160 872a03a3073ca18bc853048b65159af52495c915 SHA1 1cb89aa08a8265a97834964661999cfe93c99b6b SHA256 875e175940856ef613be27a65f136772a366c93289100abc07cb083333ae46df
 EBUILD grub-1.98-r9.ebuild 3799 RMD160 70067983c5394c5f2f876e8be18eee97bf1dd4dd SHA1 149c73a384e913b0d27b7fee61d4d0110cf0eb34 SHA256 271d79ea8be44a6aeebcf9af6676a2c90c4ec43120882225a5b5b8fe3ba4f6d5
-EBUILD grub-1.99.ebuild 7808 RMD160 0fa7ce32a511cf50f19f1fbda105895481dab7b3 SHA1 84442136e82509c963ee7ce390be794368f9fee7 SHA256 be84ddee0a8b02572b5b201afd4cd250fffe80f25a4524ce33c6e1dc7cf1cda2
+EBUILD grub-1.99.ebuild 7901 RMD160 0cfb8eff45be91b05b0470efc1c25d281084bac6 SHA1 a3722da83b889a1671dcfac2f084a713c55cd18a SHA256 0886b1dbb0ab45ae8b7db4558cb1a861c156e774af474a02e62d62a270c915fc
diff --git a/sys-boot/grub/files/disable_load_video.patch b/sys-boot/grub/files/disable_load_video.patch
new file mode 100644
index 0000000..83bfdf3
--- /dev/null
+++ b/sys-boot/grub/files/disable_load_video.patch
@@ -0,0 +1,36 @@
+--- util.orig/grub.d/10_linux.in	2011-05-14 20:36:49.000000000 +0000
++++ util/grub.d/10_linux.in	2011-07-11 18:11:19.413850269 +0000
+@@ -75,33 +75,6 @@
+       save_default_entry | sed -e "s/^/\t/"
+   fi
+ 
+-  # Use ELILO's generic "efifb" when it's known to be available.
+-  # FIXME: We need an interface to select vesafb in case efifb can't be used.
+-  if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
+-      cat << EOF
+-	load_video
+-EOF
+-      if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
+-	  && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
+-	  cat << EOF
+-	set gfxpayload=keep
+-EOF
+-      fi
+-  else
+-      if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
+-	  cat << EOF
+-	load_video
+-EOF
+-      fi
+-	  cat << EOF
+-	set gfxpayload=$GRUB_GFXPAYLOAD_LINUX
+-EOF
+-  fi
+-
+-  cat << EOF
+-	insmod gzio
+-EOF
+-
+   if [ x$dirname = x/ ]; then
+     if [ -z "${prepare_root_cache}" ]; then
+       prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/")"
diff --git a/sys-boot/grub/files/grub2-default b/sys-boot/grub/files/grub2-default
index 7f16ccc..b7ddca1 100644
--- a/sys-boot/grub/files/grub2-default
+++ b/sys-boot/grub/files/grub2-default
@@ -3,7 +3,7 @@
 # /boot/grub/grub.cfg.
 
 GRUB_DEFAULT=saved
-GRUB_DISTRIBUTOR="Sabayon"
+GRUB_DISTRIBUTOR="Gentoo"
 GRUB_HIDDEN_TIMEOUT=0
 GRUB_HIDDEN_TIMEOUT_QUIET=true
 GRUB_TIMEOUT=5
@@ -40,11 +40,11 @@ GRUB_COLOR_NORMAL="white/black"
 # Boot menu option "highlight" color
 GRUB_COLOR_HIGHLIGHT="magenta/black"
 
-if [ -f "/etc/default/sabayon-grub" ]; then
+if [ -f "/etc/default/gentoo-grub" ]; then
 	# this file is placed by the Sabayon Installer and contains
 	# custom GRUB_CMDLINE_LINUX parameters created at install
 	# time.
-	source /etc/default/sabayon-grub
+	source /etc/default/gentoo-grub
 fi
 
 # DO NOT REMOVE THIS IF YOUR GRUB_CMDLINE_LINUX IS EMPTY (BACKWARD COMPAT)
diff --git a/sys-boot/grub/files/grub2-default-1.99 b/sys-boot/grub/files/grub2-default-1.99
index 9bc0775..7832b19 100644
--- a/sys-boot/grub/files/grub2-default-1.99
+++ b/sys-boot/grub/files/grub2-default-1.99
@@ -3,7 +3,7 @@
 # /boot/grub/grub.cfg.
 
 GRUB_DEFAULT=saved
-GRUB_DISTRIBUTOR="Sabayon"
+GRUB_DISTRIBUTOR="Gentoo"
 GRUB_HIDDEN_TIMEOUT=0
 GRUB_HIDDEN_TIMEOUT_QUIET=true
 GRUB_TIMEOUT=5
@@ -41,11 +41,11 @@ GRUB_COLOR_NORMAL="white/black"
 # Boot menu option "highlight" color
 GRUB_COLOR_HIGHLIGHT="magenta/black"
 
-if [ -f "/etc/default/sabayon-grub" ]; then
+if [ -f "/etc/default/gentoo-grub" ]; then
 	# this file is placed by the Sabayon Installer and contains
 	# custom GRUB_CMDLINE_LINUX parameters created at install
 	# time.
-	source /etc/default/sabayon-grub
+	source /etc/default/gentoo-grub
 fi
 
 # DO NOT REMOVE THIS IF YOUR GRUB_CMDLINE_LINUX IS EMPTY (BACKWARD COMPAT)
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
index 3ca30a1..9b78b5b 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -157,6 +157,8 @@ src_prepare() {
 	# Genkernel doesn't support "single" for rescue mode
 	# but rather init_opts=single
 	epatch "${FILESDIR}"/${PN}-1.98-genkernel-initramfs-single.patch
+	# Gentoo doesn't play nicely with load_video
+	epatch "${FILESDIR}"/disable_load_video.patch
 
 	sed -i -e '/^autoreconf/ d' autogen.sh || die
 	(. ./autogen.sh) || die