X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F38disable_restricted_manager;h=f54d092d54b267afd0494e325ebf38d9d21cfcf3;hb=bd2cfbec5fe67ea696162c1caa5c80187a070bee;hp=2a6f1cad80c47803ca6f830806bde171c9fe561e;hpb=b15f95e06e40a70ed75c30b31cee89d43ec8196b;p=live-boot-grml.git

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index 2a6f1ca..f54d092 100755
--- a/scripts/live-bottom/38disable_restricted_manager
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -2,8 +2,6 @@
 
 PREREQ=""
 
-. /scripts/live-functions
-
 prereqs()
 {
        echo "$PREREQ"
@@ -22,9 +20,17 @@ then
 	exit 0
 fi
 
+. /scripts/live-functions
+
 log_begin_msg "Disabling restricted-manager..."
 
 rm -f /root/etc/xdg/autostart/restricted-manager.desktop
 rm -f /root/etc/xdg/autostart/restricted-manager-kde.desktop
 
+# Since we disable restricted-manager, there isn't much point generating the
+# fglrx or nvidia modules either. The other restricted modules may still be
+# useful.
+sed -i 's/^DISABLED_MODULES=""/DISABLED_MODULES="fglrx nv"/' \
+	/root/etc/default/linux-restricted-modules-common
+
 log_end_msg