From 22a346b94ff2c9626ebde0d828d975fe7deb2a33 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 9 Jul 2013 17:02:25 +0200 Subject: [PATCH] Drop video=uvesafb from grub.cfg, wasn't loaded and we have efifb --- boot/core/boot/grub/grub.cfg | 6 +++--- remaster/hardenedserver_grub.cfg | 4 ++-- remaster/minimal_amd64_x86_grub.cfg | 20 ++++++++++---------- remaster/minimal_grub.cfg | 6 +++--- remaster/standard_grub.cfg | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/boot/core/boot/grub/grub.cfg b/boot/core/boot/grub/grub.cfg index 0b1d67d..ff702ce 100644 --- a/boot/core/boot/grub/grub.cfg +++ b/boot/core/boot/grub/grub.cfg @@ -59,7 +59,7 @@ menuentry "Start Sabayon __VERSION__ SpinBase" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -68,7 +68,7 @@ menuentry "Installation" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb quiet installer-text vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash quiet installer-text vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -79,7 +79,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb checkdisc vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash checkdisc vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } diff --git a/remaster/hardenedserver_grub.cfg b/remaster/hardenedserver_grub.cfg index 33fbf67..7b1388b 100644 --- a/remaster/hardenedserver_grub.cfg +++ b/remaster/hardenedserver_grub.cfg @@ -59,7 +59,7 @@ menuentry "Start Sabayon __VERSION__ HardenedServer" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -68,7 +68,7 @@ menuentry "Installation" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } diff --git a/remaster/minimal_amd64_x86_grub.cfg b/remaster/minimal_amd64_x86_grub.cfg index 2ff98a2..9f1ab54 100644 --- a/remaster/minimal_amd64_x86_grub.cfg +++ b/remaster/minimal_amd64_x86_grub.cfg @@ -59,7 +59,7 @@ menuentry "Start Sabayon __VERSION__ x86_64 __FLAVOUR__" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs splash video=uvesafb quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon64.igz } @@ -68,7 +68,7 @@ menuentry "Start Sabayon __VERSION__ i686 __FLAVOUR__" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs splash video=uvesafb quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon32.igz } @@ -77,7 +77,7 @@ menuentry "Start Sabayon __VERSION__ x86_64 Media Center" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs splash video=uvesafb quiet vconsole.keymap=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs splash quiet vconsole.keymap=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon64.igz } @@ -86,7 +86,7 @@ menuentry "Start Sabayon __VERSION__ i686 Media Center" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs splash video=uvesafb quiet vconsole.keymap=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs splash quiet vconsole.keymap=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon32.igz } @@ -95,7 +95,7 @@ menuentry "Installation (x86_64)" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs splash video=uvesafb quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs splash quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon64.igz } @@ -104,7 +104,7 @@ menuentry "Installation (i686)" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs splash video=uvesafb quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs splash quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon32.igz } @@ -116,7 +116,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs video=uvesafb quiet vconsole.keymap=${bootkeymap} gentoo=nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs quiet vconsole.keymap=${bootkeymap} gentoo=nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon64.igz } @@ -125,7 +125,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs video=uvesafb quiet vconsole.keymap=${bootkeymap} gentoo=nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs quiet vconsole.keymap=${bootkeymap} gentoo=nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon32.igz } @@ -134,7 +134,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs splash video=uvesafb quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot ${init_opt} loop=/livecd64.squashfs splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon64.igz } @@ -143,7 +143,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs splash video=uvesafb quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot ${init_opt} loop=/livecd32.squashfs splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon32.igz } diff --git a/remaster/minimal_grub.cfg b/remaster/minimal_grub.cfg index b522489..a872eb2 100644 --- a/remaster/minimal_grub.cfg +++ b/remaster/minimal_grub.cfg @@ -59,7 +59,7 @@ menuentry "Start Sabayon __VERSION__ __FLAVOUR__" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -68,7 +68,7 @@ menuentry "Installation" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -89,7 +89,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } diff --git a/remaster/standard_grub.cfg b/remaster/standard_grub.cfg index 6a529f9..2938822 100644 --- a/remaster/standard_grub.cfg +++ b/remaster/standard_grub.cfg @@ -59,7 +59,7 @@ menuentry "Start Sabayon __VERSION__ __FLAVOUR__" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -68,7 +68,7 @@ menuentry "Start Sabayon __VERSION__ Media Center" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -77,7 +77,7 @@ menuentry "Installation" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -86,7 +86,7 @@ menuentry "Installation (Media Center)" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs cdroot ${init_opt} splash video=uvesafb quiet vconsole.keymap=${bootkeymap} installer-gui mceinstall locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} installer-gui mceinstall locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz }