From 7511099e4b879d719097736cf867243aa3d5ff13 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Fri, 31 Aug 2012 08:11:11 +0200
Subject: [PATCH] [scripts] remove nouveau blacklist if proprietary drivers are
 not on the image

---
 scripts/remaster_generic_inner_chroot_script_after.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 3dc0c92..98a37c3 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -107,6 +107,10 @@ setup_oss_gfx_drivers() {
 	# This file is polled by the txt.cfg
 	# (isolinux config file) setup script
 	touch /.enable_kms
+
+	# Remove nouveau from blacklist
+	sed -i ":^blacklist: s:blacklist nouveau:# blacklist nouveau:g" \
+		/etc/modprobe.d/blacklist.conf
 }
 
 has_proprietary_drivers() {
@@ -297,7 +301,7 @@ prepare_mate() {
         setup_displaymanager
         remove_mozilla_skel_cruft
         setup_cpufrequtils
-        has_proprietary_drivers && setup_proprietary_gfx_drivers || setup_oss_gfx_drivers	
+        has_proprietary_drivers && setup_proprietary_gfx_drivers || setup_oss_gfx_drivers
 }
 
 prepare_e17() {