diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-11-11 17:33:47 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:02 +0100 |
| commit | c3e20f8ca4cd37d2641007947e58c781fd501f11 (patch) | |
| tree | 1b045cfeb6756ed2a323a4956adf92834202c926 | |
| parent | 9c7aa9141ce947bf2ea2430e430d0571c28de954 (diff) | |
| download | live-boot-c3e20f8ca4cd37d2641007947e58c781fd501f11.tar.gz live-boot-c3e20f8ca4cd37d2641007947e58c781fd501f11.zip | |
Merging casper 1.140.
| -rw-r--r-- | docs/ChangeLog.casper | 15 | ||||
| -rwxr-xr-x | scripts/live-bottom/30accessibility | 4 | ||||
| -rwxr-xr-x | scripts/live-bottom/38disable_restricted_manager | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 153901c..1984c57 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,18 @@ +casper (1.140) intrepid; urgency=low + + [ Colin Watson ] + * Disable jockey as well as the old restricted-manager. While jockey does + do more than restricted-manager did, it also still uses a good chunk of + memory for a use case that's fairly limited on the live CD. + + [ Luke Yelavich ] + * scripts/casper-bottom/30accessibility & + ubiquity-hooks/30accessibility: + - Check that usr/bin/orca exists and is executable before creating user + settings files. + + -- Luke Yelavich <themuso@ubuntu.com> Fri, 12 Sep 2008 19:23:41 +1000 + casper (1.139) intrepid; urgency=low * add compcache conf.d configuration for initramfs-tools diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility index a169342..2a91157 100755 --- a/scripts/live-bottom/30accessibility +++ b/scripts/live-bottom/30accessibility @@ -70,7 +70,7 @@ case ${ACCESS} in gct -s -t bool /desktop/gnome/applications/at/visual/startup true gct -s -t bool /apps/gksu/disable-grab true - if type orca > /dev/null 2>&1 + if [ -x /root/usr/bin/orca ] then mkdir -p /root/home/${USERNAME}/.orca echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py @@ -97,7 +97,7 @@ case ${ACCESS} in gct -s -t bool /apps/gksu/disable-grab true gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity - if type orca > /dev/null 2>&1 + if [ -x /root/usr/bin/orca ] then mkdir -p /root/home/${USERNAME}/.orca echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager index d585d3c..c2096ed 100755 --- a/scripts/live-bottom/38disable_restricted_manager +++ b/scripts/live-bottom/38disable_restricted_manager @@ -27,6 +27,8 @@ 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. |