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

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index 2a6f1ca..d585d3c 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,20 @@ then
 	exit 0
 fi
 
-log_begin_msg "Disabling restricted-manager..."
+. /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.
+if [ -e /root/etc/default/linux-restricted-modules-common ]
+then
+	sed -i 's/^DISABLED_MODULES=""/DISABLED_MODULES="fglrx nv"/' \
+		/root/etc/default/linux-restricted-modules-common
+fi
+
 log_end_msg