From 3d947c5fae540adc70cbae0a1340ca57ef726227 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 10 Jul 2011 17:34:51 +0200 Subject: [PATCH] Restore nouveau support by removing kernel module blacklisting --- platforms/bootcd/post.inc.sh | 4 ---- platforms/bootusb/post.inc.sh | 4 ---- platforms/flash-1GB/post.inc.sh | 4 ---- platforms/flash-512MB/post.inc.sh | 4 ---- platforms/flash-server/post.inc.sh | 4 ---- platforms/installdvd/post.inc.sh | 4 ---- platforms/livecd-gnome-root/post.inc.sh | 4 ---- platforms/livecd-light-root/post.inc.sh | 4 ---- platforms/livecd-root/post.inc.sh | 4 ---- platforms/livecd/post.inc.sh | 4 ---- platforms/livedvd-root/post.inc.sh | 4 ---- platforms/livedvd/post.inc.sh | 4 ---- platforms/livegames-root/post.inc.sh | 4 ---- platforms/testcd/Makefile.defs | 2 +- platforms/testcd/post.inc.sh | 4 ---- platforms/virtualserver/post.inc.sh | 4 ---- 16 files changed, 1 insertion(+), 61 deletions(-) diff --git a/platforms/bootcd/post.inc.sh b/platforms/bootcd/post.inc.sh index 9d14285..767702d 100644 --- a/platforms/bootcd/post.inc.sh +++ b/platforms/bootcd/post.inc.sh @@ -9,10 +9,6 @@ chroot $MOUNTDIR depmod -a ${KERNEL_MAJVER}${KERNEL_EXTRAVER} # 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 - LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ --nomdadmconf --nolvmconf \ 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/flash-1GB/post.inc.sh b/platforms/flash-1GB/post.inc.sh index 9857477..bb89507 100644 --- a/platforms/flash-1GB/post.inc.sh +++ b/platforms/flash-1GB/post.inc.sh @@ -12,10 +12,6 @@ sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab # make initramfs chroot $MOUNTDIR depmod -a -# 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/flash-512MB/post.inc.sh b/platforms/flash-512MB/post.inc.sh index 64d7f6d..6f02d55 100644 --- a/platforms/flash-512MB/post.inc.sh +++ b/platforms/flash-512MB/post.inc.sh @@ -11,10 +11,6 @@ sed -i '/^[4-6]:.*/d' $MOUNTDIR/etc/inittab # 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 - LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ --nomdadmconf --nolvmconf \ diff --git a/platforms/flash-server/post.inc.sh b/platforms/flash-server/post.inc.sh index f5eb505..dea0fd2 100644 --- a/platforms/flash-server/post.inc.sh +++ b/platforms/flash-server/post.inc.sh @@ -5,10 +5,6 @@ # 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 - LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ --nomdadmconf --nolvmconf \ diff --git a/platforms/installdvd/post.inc.sh b/platforms/installdvd/post.inc.sh index 3f79690..57e734e 100644 --- a/platforms/installdvd/post.inc.sh +++ b/platforms/installdvd/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/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh index 92f3fc8..05d698f 100644 --- a/platforms/livecd-gnome-root/post.inc.sh +++ b/platforms/livecd-gnome-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-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh index 6487bdd..0eea421 100644 --- a/platforms/livecd-light-root/post.inc.sh +++ b/platforms/livecd-light-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/post.inc.sh b/platforms/livecd-root/post.inc.sh index 8c7b698..d52a2b5 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/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 112b7b0..ee146cc 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/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/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index 60d99a2..e7b2850 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/testcd/Makefile.defs b/platforms/testcd/Makefile.defs index 224cbbf..1777bea 100644 --- a/platforms/testcd/Makefile.defs +++ b/platforms/testcd/Makefile.defs @@ -4,4 +4,4 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia libGLcore.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia -xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-nouveau +#xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-nouveau diff --git a/platforms/testcd/post.inc.sh b/platforms/testcd/post.inc.sh index 5e56ad8..9965060 100644 --- a/platforms/testcd/post.inc.sh +++ b/platforms/testcd/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/virtualserver/post.inc.sh b/platforms/virtualserver/post.inc.sh index 8c0b067..b50e507 100644 --- a/platforms/virtualserver/post.inc.sh +++ b/platforms/virtualserver/post.inc.sh @@ -5,10 +5,6 @@ # 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 - LANG=${LANGUAGE}_${COUNTRY} chroot $MOUNTDIR dracut \ --filesystems "ext3 ext4 unionfs squashfs isofs reiserfs reiser4" \ --nomdadmconf --nolvmconf \