From 1afc09752a273bf1dfdafb2abd1a87dd78c75af3 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 3 Jul 2013 10:26:14 +0200 Subject: [PATCH] Do not force any particular depth mode for uvesafb --- boot/core/isolinux/txt.cfg | 4 ++-- remaster/hardenedserver_isolinux.cfg | 8 ++++---- remaster/minimal_amd64_x86_isolinux.cfg | 16 ++++++++-------- remaster/minimal_isolinux.cfg | 8 ++++---- remaster/standard_isolinux.cfg | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/boot/core/isolinux/txt.cfg b/boot/core/isolinux/txt.cfg index 2d6abbf..dc9f550 100644 --- a/boot/core/isolinux/txt.cfg +++ b/boot/core/isolinux/txt.cfg @@ -3,7 +3,7 @@ default console label console menu label Start Sabayon __VERSION__ SpinBase kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 quiet -- label console-safe menu label Start with no splash @@ -13,7 +13,7 @@ label console-safe label text-install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 quiet installer-text -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 quiet installer-text -- label genuine menu label Safe ^Mode diff --git a/remaster/hardenedserver_isolinux.cfg b/remaster/hardenedserver_isolinux.cfg index 5f46620..deadba8 100644 --- a/remaster/hardenedserver_isolinux.cfg +++ b/remaster/hardenedserver_isolinux.cfg @@ -3,12 +3,12 @@ default console label sabayon menu label Start Sabayon __VERSION__ HardenedServer kernel /boot/sabayon - append initrd=/boot/sabayon.igz cdroot splash video=uvesafb:1024x768-32 quiet -- + append initrd=/boot/sabayon.igz cdroot splash video=uvesafb:1024x768 quiet -- label install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz cdroot splash video=uvesafb:1024x768-32 quiet installer-gui -- + append initrd=/boot/sabayon.igz cdroot splash video=uvesafb:1024x768 quiet installer-gui -- label genuine menu label Start in Safe ^Mode @@ -18,7 +18,7 @@ label genuine label console menu label ^Console mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz cdroot splash video=uvesafb:1024x768-32 gentoo=nox quiet -- + append initrd=/boot/sabayon.igz cdroot splash video=uvesafb:1024x768 gentoo=nox quiet -- label console-safe menu label ^Console mode (no splash) @@ -28,7 +28,7 @@ label console-safe label debug menu label Deb^ug mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz cdroot video=uvesafb:1024x768-32 debug -- + append initrd=/boot/sabayon.igz cdroot video=uvesafb:1024x768 debug -- label checkdisk menu label ^Check disc for defects diff --git a/remaster/minimal_amd64_x86_isolinux.cfg b/remaster/minimal_amd64_x86_isolinux.cfg index 7705403..483b0cf 100644 --- a/remaster/minimal_amd64_x86_isolinux.cfg +++ b/remaster/minimal_amd64_x86_isolinux.cfg @@ -3,32 +3,32 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ x86_64 __FLAVOUR__ kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash video=uvesafb:1024x768-32 quiet -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash video=uvesafb:1024x768 quiet -- label sabayon32 menu label ^Start Sabayon __VERSION__ i686 __FLAVOUR__ kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash video=uvesafb:1024x768-32 quiet -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash video=uvesafb:1024x768 quiet -- label sabayonmce menu label ^Start Sabayon __VERSION__ x86_64 __FLAVOUR__ Media Center kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash video=uvesafb:1024x768-32 quiet sabayonmce -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash video=uvesafb:1024x768 quiet sabayonmce -- label sabayonmce32 menu label ^Start Sabayon __VERSION__ i686 __FLAVOUR__ Media Center kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash video=uvesafb:1024x768-32 quiet sabayonmce -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash video=uvesafb:1024x768 quiet sabayonmce -- label install menu label Graphical ^Installation x86_64 kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash video=uvesafb:1024x768-32 quiet installer-gui -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash video=uvesafb:1024x768 quiet installer-gui -- label install32 menu label Graphical ^Installation i686 kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash video=uvesafb:1024x768-32 quiet installer-gui -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash video=uvesafb:1024x768 quiet installer-gui -- label genuine menu label Safe ^Mode x86_64 @@ -43,12 +43,12 @@ label genuine32 label console menu label ^Console mode x86_64 kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash video=uvesafb:1024x768-32 gentoo=nox quiet -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash video=uvesafb:1024x768 gentoo=nox quiet -- label console32 menu label ^Console mode i686 kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash video=uvesafb:1024x768-32 gentoo=nox quiet -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash video=uvesafb:1024x768 gentoo=nox quiet -- label console-safe menu label ^Console mode x86_64 (no splash) diff --git a/remaster/minimal_isolinux.cfg b/remaster/minimal_isolinux.cfg index 9d2b55d..1830ceb 100644 --- a/remaster/minimal_isolinux.cfg +++ b/remaster/minimal_isolinux.cfg @@ -3,12 +3,12 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ __FLAVOUR__ kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 quiet -- label install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 quiet installer-gui -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 quiet installer-gui -- label genuine menu label Safe ^Mode @@ -18,7 +18,7 @@ label genuine label console menu label ^Console mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 gentoo=nox quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 gentoo=nox quiet -- label console-safe menu label ^Console mode (no splash) @@ -28,7 +28,7 @@ label console-safe label checkdisk menu label ^Check disc for defects kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 quiet checkdisc -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 quiet checkdisc -- label debug menu label Deb^ug mode diff --git a/remaster/standard_isolinux.cfg b/remaster/standard_isolinux.cfg index f5ee985..e95cff9 100644 --- a/remaster/standard_isolinux.cfg +++ b/remaster/standard_isolinux.cfg @@ -3,21 +3,21 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ __FLAVOUR__ kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 quiet -- label sabayonmce menu label ^Start Sabayon Media Center kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 quiet sabayonmce -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 quiet sabayonmce -- label install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 quiet installer-gui -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 quiet installer-gui -- label mceinstall menu label ^Installation (Media Center) kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 quiet installer-gui mceinstall -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 quiet installer-gui mceinstall -- label genuine menu label Safe ^Mode @@ -27,7 +27,7 @@ label genuine label console menu label ^Console mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768-32 gentoo=nox quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash video=uvesafb:1024x768 gentoo=nox quiet -- label console-safe menu label ^Console mode (no splash)