Adding upstream version 1.215.1.

[live-boot-grml.git] / scripts / live-bottom / 30accessibility

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 3c51fa0..4624077 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -57,6 +57,7 @@ remove_applet ()
        local line_no prior_line next_line
 
        line_no="$(grep -n "<string>$1</string>" /root/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)"
+       [ "$line_no" ] || return
        prior_line="$((line_no-1))"
        next_line="$((line_no+1))"
 
@@ -115,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
@@ -149,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