[scripts] remove nouveau blacklist if proprietary drivers are not on the image

This commit is contained in:
Fabio Erculiani 2012-08-31 08:11:11 +02:00
parent 4e2fe44e57
commit 7511099e4b

View File

@ -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() {