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

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index 2f2db35..d585d3c 100755
--- a/scripts/live-bottom/38disable_restricted_manager
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 PREREQ=""
-DESCRIPTION="Disabling restricted-manager..."
-
-. /scripts/casper-functions
 
 prereqs()
 {
@@ -18,10 +15,25 @@ prereqs)
        ;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+if [ -n "${NORESTRICTEDMANAGER}" ]
+then
+	exit 0
+fi
 
-rm -f /root/etc/xdg/autostart/restricted-manager.desktop
+. /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