Adding upstream version 1.110.1.

[live-boot-grml.git] / scripts / live-bottom / 38disable_restricted_manager

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index 2a6f1ca..16a78f3 100755 (executable)
--- a/scripts/live-bottom/38disable_restricted_manager
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -27,4 +27,10 @@ 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