From fb5cf9d5f0a74580952e57e31d3d098a8d9581f0 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 22 Jul 2011 16:31:38 +0200 Subject: [PATCH] Backport from openmamba (devel): nouveau support and squashfs xz compression (kernel 2.6.38) --- platforms/bootusb/post.inc.sh | 4 ---- platforms/livecd-root/post.inc.sh | 4 ---- platforms/livecd-root/settings.inc | 2 +- platforms/livecd/post.inc.sh | 4 ---- platforms/livedvd-root/post.inc.sh | 4 ---- platforms/livedvd-root/settings.inc | 2 +- platforms/livedvd/post.inc.sh | 4 ---- platforms/livedvd/root/boot/isolinux/help.txt | 21 +++++++++---------- platforms/livegames-root/post.inc.sh | 4 ---- platforms/livegames-root/settings.inc | 2 +- 10 files changed, 13 insertions(+), 38 deletions(-) diff --git a/platforms/bootusb/post.inc.sh b/platforms/bootusb/post.inc.sh index 924fcc3..2206373 100644 --- a/platforms/bootusb/post.inc.sh +++ b/platforms/bootusb/post.inc.sh @@ -1,9 +1,5 @@ # make initramfs -# temporary workaround to disable nouveau driver in favour of nvidia proprietary until -# it gets 3D support -echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf - chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} ## FIXME: ONLY FOR TEST; REMOVE THE FOLLOWING LINE! diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index 0ed6160..ae167ee 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -3,10 +3,6 @@ #rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} #rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} -# temporary workaround to disable nouveau driver in favour of nvidia proprietary until -# it gets 3D support -echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf - # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." diff --git a/platforms/livecd-root/settings.inc b/platforms/livecd-root/settings.inc index fc4c084..ec396d9 100644 --- a/platforms/livecd-root/settings.inc +++ b/platforms/livecd-root/settings.inc @@ -1,5 +1,5 @@ PRODUCT_NAME=livecd -MEDIA=squash_lzma +MEDIA=squash_xz MULTITHREAD=1 KERNEL_EXTRAVER=mamba diff --git a/platforms/livecd/post.inc.sh b/platforms/livecd/post.inc.sh index 6caa555..fc37b66 100644 --- a/platforms/livecd/post.inc.sh +++ b/platforms/livecd/post.inc.sh @@ -9,10 +9,6 @@ chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} -# temporary workaround to disable nouveau driver in favour of nvidia proprietary until -# it gets 3D support -echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf - LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ --nomdadmconf --nolvmconf \ diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index ffddfe5..7e3ed1c 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -3,10 +3,6 @@ #rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} #rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} -# temporary workaround to disable nouveau driver in favour of nvidia proprietary until -# it gets 3D support -echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf - # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." diff --git a/platforms/livedvd-root/settings.inc b/platforms/livedvd-root/settings.inc index ed1a477..73549fa 100644 --- a/platforms/livedvd-root/settings.inc +++ b/platforms/livedvd-root/settings.inc @@ -1,5 +1,5 @@ PRODUCT_NAME=livedvd -MEDIA=squash_lzma +MEDIA=squash_xz MULTITHREAD=1 KERNEL_EXTRAVER=mamba diff --git a/platforms/livedvd/post.inc.sh b/platforms/livedvd/post.inc.sh index d111ca1..9965060 100644 --- a/platforms/livedvd/post.inc.sh +++ b/platforms/livedvd/post.inc.sh @@ -9,10 +9,6 @@ chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} -# temporary workaround to disable nouveau driver in favour of nvidia proprietary until -# it gets 3D support -echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf - LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ --nomdadmconf --nolvmconf \ diff --git a/platforms/livedvd/root/boot/isolinux/help.txt b/platforms/livedvd/root/boot/isolinux/help.txt index aaec0b5..94a01b6 100644 --- a/platforms/livedvd/root/boot/isolinux/help.txt +++ b/platforms/livedvd/root/boot/isolinux/help.txt @@ -2,20 +2,19 @@ openmamba CD boot menu ====================== - 1) System startup at 800x600 resolution (default choice) - 2) System startup at 1024x768 resolution - 3) System startup at 1280x1024 resolution - 1-freevideo,2-freevideo,3-freevideo) like 1,2,3 + Open Source video drivers - 8) System startup in debug mode - 9) Start a system memory benchmark + kms) Autodetect startup video mode (default choice) + vga1024) Force system startup at 1024x768 resolution + vga800) Force system startup at 1280x1024 resolution + + debug) System startup in debug mode + memtest) Start a system memory benchmark -Please, enter 1 or wait 10 seconds to boot automatically. +Please, enter your choice or wait 10 seconds to boot automatically. You can also pass some extra parameters to the kernel. For example: -boot: 1 debug=1 video=uvesafb:off postplug=nosound,freevideo +boot: kms debug=1 splash=off postplug=nosound,freevideo -If you have trouble booting the system please use the choice '8' or the -debug=1 and vga=normal options in order to see system messages. +If you have trouble booting the system please use the choice 'debug' or the +debug=1 and splash=off options in order to see system messages. NOTE: In most cases you just need to hit ENTER to boot with default settings. - diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index 3844b53..7630c69 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-root/post.inc.sh @@ -3,10 +3,6 @@ #rm -f $MOUNTDIR/etc/rc*.d/{S12random,S13sysinit,S20network,S44acpid,S55sshd} #rm -f $MOUNTDIR/etc/rc*.d/{K00splash,K01acpid,K90random,K96swap,K97network,K97udev,K98localnet} -# temporary workaround to disable nouveau driver in favour of nvidia proprietary until -# it gets 3D support -echo "blacklist nouveau" > $MOUNTDIR/etc/modprobe.d/nouveau.conf - # change inittab so it opens tty root shells instead of asking for login # echo "Forcing \`inittab' to open tty root shells with no login..." diff --git a/platforms/livegames-root/settings.inc b/platforms/livegames-root/settings.inc index e5e9e78..65a0924 100644 --- a/platforms/livegames-root/settings.inc +++ b/platforms/livegames-root/settings.inc @@ -1,4 +1,4 @@ -MEDIA=squash_lzma +MEDIA=squash_xz MULTITHREAD=1 PRODUCT_NAME=livegames