X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F38disable_restricted_manager;h=c2096edf2057dabb248d734ccc199c576b68bdfe;hb=79d6bae5f387b2e0f38e47b9b46a78ad1e334a9f;hp=f54d092d54b267afd0494e325ebf38d9d21cfcf3;hpb=1a58af64d2bdf64505849781dd81b12b70547332;p=live-boot-grml.git

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index f54d092..c2096ed 100755
--- a/scripts/live-bottom/38disable_restricted_manager
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -22,15 +22,20 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Disabling restricted-manager..."
+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
 
+rm -f /root/etc/xdg/autostart/jockey*.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
+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