diff options
| author |   wiktor w brodlo <wiktor@brodlo.net> | 2011-07-11 18:39:33 +0000 |
|---|---|---|
| committer | wiktor w brodlo <wiktor@brodlo.net> | 2011-07-11 18:39:33 +0000 |
| commit | ccc0e5ca28ac17db6cb06341c01743d484dfe79e (patch) | |
| tree | a1ad7c88135d32c20a80f24ede340c99f46b75e5 /sys-boot/grub/files | |
| parent | GRUB2 from Sabayon (diff) | |
| download | anaconda-overlay-ccc0e5ca28ac17db6cb06341c01743d484dfe79e.tar.gz anaconda-overlay-ccc0e5ca28ac17db6cb06341c01743d484dfe79e.tar.bz2 anaconda-overlay-ccc0e5ca28ac17db6cb06341c01743d484dfe79e.zip | |
grub: disable load_video (doesn't work well with Gentoo)
Diffstat (limited to 'sys-boot/grub/files')
| -rw-r--r-- | sys-boot/grub/files/disable_load_video.patch | 36 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub2-default | 6 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub2-default-1.99 | 6 |
3 files changed, 42 insertions, 6 deletions
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) |