diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 12:12:04 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:08 +0100 |
| commit | ef4ec3a72d79454603dfb8a0611852d858e515ea (patch) | |
| tree | 9d4dbabf78cd217db9dd3365fbc33303159ef568 | |
| parent | 679fbb85c218217301cf6d9fdf1dddf1f8686056 (diff) | |
| download | live-boot-ef4ec3a72d79454603dfb8a0611852d858e515ea.tar.gz live-boot-ef4ec3a72d79454603dfb8a0611852d858e515ea.zip | |
Merging casper 1.203.
| -rw-r--r-- | docs/ChangeLog.casper | 9 | ||||
| -rwxr-xr-x | scripts/live-bottom/30accessibility | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 54b2151..ffedac1 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,12 @@ +casper (1.203) karmic; urgency=low + + * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility: + - Change .pulse_a11y_nostart location to /var/lib/pulseaudio, as per + the change in pulseaudio itself, to solve a race condition with volume + settings restore. + + -- Luke Yelavich <themuso@ubuntu.com> Mon, 12 Oct 2009 08:31:51 +1100 + casper (1.202) karmic; urgency=low * scripts/casper-bottom/46_disable_services: diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility index 45d1aa1..7681aef 100755 --- a/scripts/live-bottom/30accessibility +++ b/scripts/live-bottom/30accessibility @@ -116,8 +116,9 @@ case ${ACCESS} in remove_applet fast_user_switch if [ -x /root/usr/bin/pulse-session ] then - touch /root/home/$USERNAME/.pulse_a11y_nostart - chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.pulse_a11y_nostart + mkdir -p /root/var/lib/pulseaudio + touch /root/var/lib/pulseaudio/.pulse_a11y_nostart + chroot /root chown root.root /var/lib/pulseaudio/.pulse_a11y_nostart mkdir -p /root/home/$USERNAME/.pulse echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse @@ -150,8 +151,9 @@ case ${ACCESS} in if [ -x /root/usr/bin/pulse-session ] then - touch /root/home/$USERNAME/.pulse_a11y_nostart - chroot /root chown $USERNAME.$USERNAME /home/$USERNAME/.pulse_a11y_nostart + mkdir -p /root/var/lib/pulseaudio + touch /root/var/lib/pulseaudio/.pulse_a11y_nostart + chroot /root chown root.root /var/lib/pulseaudio/.pulse_a11y_nostart mkdir -p /root/home/$USERNAME/.pulse echo "autospawn = no" > /root/home/$USERNAME/.pulse/client.conf chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.pulse |