Merging casper 1.145.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 1f46c8d..4b279ff 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.145) intrepid; urgency=low
+
+  * 38disable_restricted_manager: Remove some obsolete l-r-m and
+    restricted-manager code, and rename the script to 38jockey_disable_check
+    to better reflect its purpose.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 06 Oct 2008 09:21:40 +0200
+
 casper (1.144) intrepid; urgency=low
 
   * Bump media detection timeout to a minute; thanks to Tormod Volden and

diff --git a/scripts/live b/scripts/live
index efd0327..bf20ffc 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -286,9 +286,9 @@ Arguments ()
                                export NOPROGRAMCRASHES
                                ;;
 
-                       norestrictedmanager)
-                               NORESTRICTEDMANAGER="Yes"
-                               export NORESTRICTEDMANAGER
+                       nojockey)
+                               NOJOCKEY="Yes"
+                               export NOJOCKEY
                                ;;
 
                        nosudo)

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
deleted file mode 100755 (executable)
index c2096ed..0000000
--- a/scripts/live-bottom/38disable_restricted_manager
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-if [ -n "${NORESTRICTEDMANAGER}" ]
-then
-       exit 0
-fi
-
-. /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
-
-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.
-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

diff --git a/scripts/live-bottom/38jockey_disable_check b/scripts/live-bottom/38jockey_disable_check
new file mode 100755 (executable)
index 0000000..1a642e1
--- /dev/null
+++ b/scripts/live-bottom/38jockey_disable_check
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+PREREQ=""
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+if [ -n "${NOJOCKEY}" ]
+then
+       exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Disabling jockey driver check"
+
+rm -f /root/etc/xdg/autostart/jockey*.desktop
+
+log_end_msg