From f9a996e1d6f4e9e92cb365d4dafc347dbf05b229 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 25 Apr 2013 12:31:38 +0100 Subject: [PATCH] [boot,remaster] remove init=/linuxrc, not needed anymore. Genkernel stores linuxrc into initramfs /init. So, the default value is already fine. --- boot/core/boot/grub/grub.cfg | 8 ++++---- boot/core/isolinux/txt.cfg | 12 ++++++------ remaster/hardenedserver_grub.cfg | 10 +++++----- remaster/hardenedserver_isolinux.cfg | 14 ++++++------- remaster/minimal_amd64_x86_grub.cfg | 24 +++++++++++------------ remaster/minimal_amd64_x86_isolinux.cfg | 26 ++++++++++++------------- remaster/minimal_grub.cfg | 10 +++++----- remaster/minimal_isolinux.cfg | 14 ++++++------- remaster/serverbase_grub.cfg | 8 ++++---- remaster/serverbase_isolinux.cfg | 12 ++++++------ remaster/standard_grub.cfg | 14 ++++++------- remaster/standard_isolinux.cfg | 18 ++++++++--------- 12 files changed, 85 insertions(+), 85 deletions(-) diff --git a/boot/core/boot/grub/grub.cfg b/boot/core/boot/grub/grub.cfg index ee8504d..77d21d8 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet installer-text vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 checkdisc vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 checkdisc vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -109,7 +109,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } diff --git a/boot/core/isolinux/txt.cfg b/boot/core/isolinux/txt.cfg index aad3160..51ae7e5 100644 --- a/boot/core/isolinux/txt.cfg +++ b/boot/core/isolinux/txt.cfg @@ -3,32 +3,32 @@ default console label console menu label Start Sabayon __VERSION__ SpinBase kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- label console-safe menu label Start with no splash kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- label text-install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-text gentoo=nox nox -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-text gentoo=nox nox -- label genuine menu label Safe ^Mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label checkdisk menu label ^Check disc for defects kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- label debug menu label Deb^ug mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug -- label memtest menu label Memory ^test diff --git a/remaster/hardenedserver_grub.cfg b/remaster/hardenedserver_grub.cfg index 18b1575..02fa526 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -80,7 +80,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox nox 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -119,7 +119,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } diff --git a/remaster/hardenedserver_isolinux.cfg b/remaster/hardenedserver_isolinux.cfg index 69627ff..e3e4539 100644 --- a/remaster/hardenedserver_isolinux.cfg +++ b/remaster/hardenedserver_isolinux.cfg @@ -3,37 +3,37 @@ default console label sabayon menu label Start Sabayon __VERSION__ HardenedServer kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- label install menu label ^Installation kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- label genuine menu label Start in Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- label debug menu label Deb^ug mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs __KMS__ console=tty1 debug -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot looptype=squashfs loop=/livecd.squashfs __KMS__ console=tty1 debug -- label checkdisk menu label ^Check disc for defects kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- + append root=/dev/ram0 initrd=/boot/sabayon.igz cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- label memtest menu label Memory ^test diff --git a/remaster/minimal_amd64_x86_grub.cfg b/remaster/minimal_amd64_x86_grub.cfg index 6848511..a4e21e6 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon32.igz } @@ -173,7 +173,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon64 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon64 aufs cdroot looptype=squashfs loop=/livecd64.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon64.igz } @@ -182,7 +182,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon32 aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon32 aufs cdroot looptype=squashfs loop=/livecd32.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon32.igz } diff --git a/remaster/minimal_amd64_x86_isolinux.cfg b/remaster/minimal_amd64_x86_isolinux.cfg index 5ec8d71..1065bf0 100644 --- a/remaster/minimal_amd64_x86_isolinux.cfg +++ b/remaster/minimal_amd64_x86_isolinux.cfg @@ -3,67 +3,67 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ x86_64 __FLAVOUR__ kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon64.igz aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- label sabayon32 menu label ^Start Sabayon __VERSION__ i686 __FLAVOUR__ kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon32.igz aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- label sabayonmce menu label ^Start Sabayon __VERSION__ x86_64 __FLAVOUR__ Media Center kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet sabayonmce -- + append initrd=/boot/sabayon64.igz aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet sabayonmce -- label sabayonmce32 menu label ^Start Sabayon __VERSION__ i686 __FLAVOUR__ Media Center kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet sabayonmce -- + append initrd=/boot/sabayon32.igz aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet sabayonmce -- label install menu label Graphical ^Installation x86_64 kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append initrd=/boot/sabayon64.igz aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- label install32 menu label Graphical ^Installation i686 kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append initrd=/boot/sabayon32.igz aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- label genuine menu label Safe ^Mode x86_64 kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon64.igz aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon32.igz aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon64.igz aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- label console32 menu label ^Console mode i686 kernel /boot/sabayon32 - append initrd=/boot/sabayon32.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon32.igz aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon64.igz aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd32.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon32.igz aufs cdroot looptype=squashfs loop=/livecd32.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- label checkdisk menu label ^Check disc for defects kernel /boot/sabayon64 - append initrd=/boot/sabayon64.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- + append initrd=/boot/sabayon64.igz aufs cdroot looptype=squashfs loop=/livecd64.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- label memtest menu label Memory ^test diff --git a/remaster/minimal_grub.cfg b/remaster/minimal_grub.cfg index ba6243b..350eb4a 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -80,7 +80,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox nox 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -119,7 +119,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } diff --git a/remaster/minimal_isolinux.cfg b/remaster/minimal_isolinux.cfg index 97d1ad4..1abcdde 100644 --- a/remaster/minimal_isolinux.cfg +++ b/remaster/minimal_isolinux.cfg @@ -3,37 +3,37 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ __FLAVOUR__ kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- label install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- label genuine menu label Safe ^Mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- label console-safe menu label ^Console mode (no splash) kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- label checkdisk menu label ^Check disc for defects kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- label debug menu label Deb^ug mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug -- label memtest menu label Memory ^test diff --git a/remaster/serverbase_grub.cfg b/remaster/serverbase_grub.cfg index b9031d1..4d98e08 100644 --- a/remaster/serverbase_grub.cfg +++ b/remaster/serverbase_grub.cfg @@ -59,7 +59,7 @@ menuentry "Start Sabayon __VERSION__ ServerBase" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-text locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-text 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -109,7 +109,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } diff --git a/remaster/serverbase_isolinux.cfg b/remaster/serverbase_isolinux.cfg index 7593efb..310e33d 100644 --- a/remaster/serverbase_isolinux.cfg +++ b/remaster/serverbase_isolinux.cfg @@ -3,32 +3,32 @@ default console label console menu label Start Sabayon __VERSION__ ServerBase kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- label console-safe menu label Start with no splash kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- label text-install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-text -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-text -- label genuine menu label Start in Safe ^Mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label checkdisk menu label ^Check disc for defects kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- label debug menu label Deb^ug mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug -- label memtest menu label Memory ^test diff --git a/remaster/standard_grub.cfg b/remaster/standard_grub.cfg index 4351eb0..614a627 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} sabayonmce locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-gui mceinstall locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} installer-gui mceinstall locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -97,7 +97,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} gentoo=nox nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -106,7 +106,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ console=tty1 quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } @@ -136,7 +136,7 @@ submenu "Advanced Options" { echo "Language: ${bootlang}" echo "Keyboard: ${bootkeymap}" echo "Please wait..." - linux /boot/sabayon aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- + linux /boot/sabayon aufs cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- initrd /boot/sabayon.igz } diff --git a/remaster/standard_isolinux.cfg b/remaster/standard_isolinux.cfg index 1272184..d5ecc8c 100644 --- a/remaster/standard_isolinux.cfg +++ b/remaster/standard_isolinux.cfg @@ -3,46 +3,46 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ __FLAVOUR__ kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet -- label sabayonmce menu label ^Start Sabayon Media Center kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet sabayonmce -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet sabayonmce -- label install menu label ^Installation kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui -- label mceinstall menu label ^Installation (Media Center) kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui mceinstall -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui mceinstall -- label genuine menu label Safe ^Mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=788 gfxpayload=800x600x16 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 init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- label console-safe menu label ^Console mode (no splash) kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=off __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet -- label checkdisk menu label ^Check disc for defects kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet checkdisc -- label debug menu label Deb^ug mode kernel /boot/sabayon - append initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug -- + append initrd=/boot/sabayon.igz aufs cdroot looptype=squashfs loop=/livecd.squashfs console=tty1 debug -- label memtest menu label Memory ^test