From 354e45c6ad60e494acc648a1b1ef6e81df73711b Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 4 Jul 2011 12:18:50 +0200 Subject: [PATCH] [molecules] workaround for udev >=168 race condition during LiveCD udev init, please re-check on Linux 3.0 release --- boot/core/isolinux/txt.cfg | 8 ++++---- remaster/minimal_isolinux.cfg | 12 ++++++------ remaster/serverbase_isolinux.cfg | 8 ++++---- remaster/standard_isolinux.cfg | 22 +++++++++++----------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/boot/core/isolinux/txt.cfg b/boot/core/isolinux/txt.cfg index bc78c33..a0e645f 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 root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 gentoo=nox nox console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 gentoo=nox nox console=tty1 quiet -- label text-install menu label ^Installation kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 console=tty1 quiet installer-text gentoo=nox nox -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 console=tty1 quiet installer-text gentoo=nox nox -- label genuine menu label Start in Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label debug menu label Deb^ug mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs console=tty1 debug -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs console=tty1 debug -- label memtest menu label Memory ^test diff --git a/remaster/minimal_isolinux.cfg b/remaster/minimal_isolinux.cfg index d46443e..7f73146 100644 --- a/remaster/minimal_isolinux.cfg +++ b/remaster/minimal_isolinux.cfg @@ -3,32 +3,32 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ __FLAVOUR__ kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet -- label install menu label Graphical ^Installation kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-gui -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-gui -- label text-install menu label Text ^Installation kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-text gentoo=nox nox -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-text gentoo=nox nox -- label genuine menu label Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 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 aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gentoo=nox nox console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gentoo=nox nox console=tty1 quiet -- label debug menu label Deb^ug mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs console=tty1 debug -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs console=tty1 debug -- label memtest menu label Memory ^test diff --git a/remaster/serverbase_isolinux.cfg b/remaster/serverbase_isolinux.cfg index faeae03..19323d9 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 root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 gentoo=nox nox console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 gentoo=nox nox console=tty1 quiet -- label text-install menu label ^Installation kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 console=tty1 quiet installer-text gentoo=nox nox -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 console=tty1 quiet installer-text gentoo=nox nox -- label genuine menu label Start in Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- label debug menu label Deb^ug mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs console=tty1 debug -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs console=tty1 debug -- label memtest menu label Memory ^test diff --git a/remaster/standard_isolinux.cfg b/remaster/standard_isolinux.cfg index 3e5ffcb..40f6ff8 100644 --- a/remaster/standard_isolinux.cfg +++ b/remaster/standard_isolinux.cfg @@ -3,54 +3,54 @@ default sabayon label sabayon menu label ^Start Sabayon __VERSION__ __FLAVOUR__ kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet music -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet music -- label sabayonnomusic menu label ^Start Sabayon w/o boot music kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet -- label sabayonmce menu label ^Start Sabayon Media Center kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet sabayonmce -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet sabayonmce -- label eeepc menu label Sabayon Netbook kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=0x315 console=tty1 quiet eeepc -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=0x315 console=tty1 quiet eeepc -- label eeepcmce menu label Sabayon Media Center Netbook kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=0x315 console=tty1 quiet eeepc sabayonmce -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=0x315 console=tty1 quiet eeepc sabayonmce -- label install menu label Graphical ^Installation kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-gui -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-gui -- label mceinstall menu label Graphical ^Installation (Media Center) kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-gui mceinstall -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-gui mceinstall -- label text-install menu label Text ^Installation kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-text gentoo=nox nox -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 console=tty1 quiet installer-text gentoo=nox nox -- label genuine menu label Safe ^Mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 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 aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gentoo=nox nox console=tty1 quiet -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gentoo=nox nox console=tty1 quiet -- label debug menu label Deb^ug mode kernel /boot/sabayon - append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs console=tty1 debug -- + append root=/dev/ram0 initrd=/boot/sabayon.igz aufs udev.children-max=1 init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs console=tty1 debug -- label memtest menu label Memory ^test kernel /boot/memtest