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

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index d7c75c0..f54d092 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,22 @@ prereqs)
        ;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+if [ -n "${NORESTRICTEDMANAGER}" ]
+then
+	exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Disabling restricted-manager..."
 
-rm -f /root/usr/share/autostart/restricted-manager.desktop
+rm -f /root/etc/xdg/autostart/restricted-manager.desktop
+rm -f /root/etc/xdg/autostart/restricted-manager-kde.desktop
 
-rm -f /root/usr/share/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