From ffa22a1583d25adf99b8c00a22a242ded3141358 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sat, 11 May 2013 18:50:36 +0200 Subject: [PATCH] [remaster,boot] gfxpayload=xxx shouldn't be needed anymore --- boot/core/isolinux/txt.cfg | 8 ++++---- remaster/hardenedserver_isolinux.cfg | 10 +++++----- remaster/minimal_amd64_x86_isolinux.cfg | 24 ++++++++++++------------ remaster/minimal_isolinux.cfg | 10 +++++----- remaster/serverbase_isolinux.cfg | 8 ++++---- remaster/standard_isolinux.cfg | 14 +++++++------- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/boot/core/isolinux/txt.cfg b/boot/core/isolinux/txt.cfg index 7d93a9f..4a3ad3d 100644 --- a/boot/core/isolinux/txt.cfg +++ b/boot/core/isolinux/txt.cfg @@ -3,22 +3,22 @@ default console label console menu label Start Sabayon __VERSION__ SpinBase kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label console-safe menu label Start with no splash kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label text-install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet installer-text gentoo=nox nox -- + append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet installer-text gentoo=nox nox -- label genuine menu label Safe ^Mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label checkdisk menu label ^Check disc for defects diff --git a/remaster/hardenedserver_isolinux.cfg b/remaster/hardenedserver_isolinux.cfg index 1fc9a87..aac6f80 100644 --- a/remaster/hardenedserver_isolinux.cfg +++ b/remaster/hardenedserver_isolinux.cfg @@ -3,27 +3,27 @@ default console label sabayon menu label Start Sabayon __VERSION__ HardenedServer kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet -- label install menu label ^Installation kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet installer-gui -- label genuine menu label Start in Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label console menu label ^Console mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label console-safe menu label ^Console mode (no splash) kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label debug menu label Deb^ug mode diff --git a/remaster/minimal_amd64_x86_isolinux.cfg b/remaster/minimal_amd64_x86_isolinux.cfg index 8f3d382..94b484c 100644 --- a/remaster/minimal_amd64_x86_isolinux.cfg +++ b/remaster/minimal_amd64_x86_isolinux.cfg @@ -3,62 +3,62 @@ 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=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet -- label sabayon32 menu label ^Start Sabayon __VERSION__ i686 __FLAVOUR__ kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 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=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet sabayonmce -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 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=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet sabayonmce -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet sabayonmce -- label install menu label Graphical ^Installation x86_64 kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet installer-gui -- label install32 menu label Graphical ^Installation i686 kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet installer-gui -- label genuine menu label Safe ^Mode x86_64 kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label genuine32 menu label Safe ^Mode i686 kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label console menu label ^Console mode x86_64 kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label console32 menu label ^Console mode i686 kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label console-safe menu label ^Console mode x86_64 (no splash) kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon64.igz aufs cdroot loop=/livecd64.squashfs splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label console32-safe menu label ^Console mode i686 (no splash) kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon32.igz aufs cdroot loop=/livecd32.squashfs splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label checkdisk menu label ^Check disc for defects diff --git a/remaster/minimal_isolinux.cfg b/remaster/minimal_isolinux.cfg index 4a84a03..95655b5 100644 --- a/remaster/minimal_isolinux.cfg +++ b/remaster/minimal_isolinux.cfg @@ -3,27 +3,27 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ __FLAVOUR__ kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet -- label install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet installer-gui -- label genuine menu label Safe ^Mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label console menu label ^Console mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label console-safe menu label ^Console mode (no splash) kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label checkdisk menu label ^Check disc for defects diff --git a/remaster/serverbase_isolinux.cfg b/remaster/serverbase_isolinux.cfg index ae1fd48..2560ff7 100644 --- a/remaster/serverbase_isolinux.cfg +++ b/remaster/serverbase_isolinux.cfg @@ -3,22 +3,22 @@ default console label console menu label Start Sabayon __VERSION__ ServerBase kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet -- label console-safe menu label Start with no splash kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet -- label text-install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet installer-text -- + append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet installer-text -- label genuine menu label Start in Safe ^Mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label checkdisk menu label ^Check disc for defects diff --git a/remaster/standard_isolinux.cfg b/remaster/standard_isolinux.cfg index 92ffd7b..b43b9bb 100644 --- a/remaster/standard_isolinux.cfg +++ b/remaster/standard_isolinux.cfg @@ -3,36 +3,36 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ __FLAVOUR__ kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet -- label sabayonmce menu label ^Start Sabayon Media Center kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet sabayonmce -- + append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet sabayonmce -- label install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet installer-gui -- label mceinstall menu label ^Installation (Media Center) kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 console=tty1 quiet installer-gui mceinstall -- + append initrd=/boot/sabayon.igz aufs cdroot splash=silent,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 console=tty1 quiet installer-gui mceinstall -- label genuine menu label Safe ^Mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label console menu label ^Console mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=verbose,theme:sabayon video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label console-safe menu label ^Console mode (no splash) kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot splash=off video=uvesafb:1024x768-16,ywrap,mtrr:3 gentoo=nox nox console=tty1 quiet -- label checkdisk menu label ^Check disc for defects