diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-11-11 17:55:40 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:03 +0100 |
| commit | 2c649cf1f86f2030a213b9b0bfc1d1a1f0c14b2c (patch) | |
| tree | 0e4ea69c4bc4acaf9f53b0e3f3907848a863d978 /scripts | |
| parent | 95cdfc252b7b9ee537bc2584717a25ff04971015 (diff) | |
| download | live-boot-2c649cf1f86f2030a213b9b0bfc1d1a1f0c14b2c.tar.gz live-boot-2c649cf1f86f2030a213b9b0bfc1d1a1f0c14b2c.zip | |
Merging casper 1.145.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 6 | ||||
| -rwxr-xr-x | scripts/live-bottom/38disable_restricted_manager | 41 | ||||
| -rwxr-xr-x | scripts/live-bottom/38jockey_disable_check | 29 |
3 files changed, 32 insertions, 44 deletions
diff --git a/scripts/live b/scripts/live index efd0327..bf20ffc 100755 --- 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 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 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 |