X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F30accessibility;h=27ddb3c5dbc80bd57a42cbf0af44c744ebac83fe;hb=5d333f2326fde2cbb49a0d6a60ac94baa8b59904;hp=3ff3fda0d8235db41ed3b97b2ec27ef349291b4b;hpb=d8479b7b2705ed8969a44e447880e2304219b5cf;p=live-boot-grml.git

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 3ff3fda..27ddb3c 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -49,10 +49,14 @@ gct ()
 
 laptop_detect ()
 {
-	if chroot /root /usr/sbin/laptop-detect
+	if [ -x /root/usr/bin/orca ]
 	then
-		echo "orca.settings.orcaModifierKeys = orca.settings.LAPTOP_MODIFIER_KEYS" >> /root/home/$USERNAME/.orca/user-settings.py
-		echo "orca.settings.keyboardLayout = orca.settings.GENERAL_KEYBOARD_LAYOUT_LAPTOP" >> /root/home/$USERNAME/.orca/user-settings.py
+		if chroot /root /usr/sbin/laptop-detect
+		then
+			mkdir -p /root/home/$USERNAME/.orca
+			echo "orca.settings.orcaModifierKeys = orca.settings.LAPTOP_MODIFIER_KEYS" >> /root/home/$USERNAME/.orca/user-settings.py
+			echo "orca.settings.keyboardLayout = orca.settings.GENERAL_KEYBOARD_LAYOUT_LAPTOP" >> /root/home/$USERNAME/.orca/user-settings.py
+		fi
 	fi
 }
 
@@ -98,6 +102,7 @@ case ${ACCESS} in
 		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
+		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		if [ -x /root/usr/bin/orca ]
 		then
@@ -119,8 +124,12 @@ case ${ACCESS} in
 		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
+		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		remove_applet fast_user_switch
+		laptop_detect
+		touch /root/etc/pulse/a11y_nostart
+		sed -i -e 's/autospawn = yes/autospawn = no/g' /root/etc/pulse/client.conf
 		;;
 
 	braille=ask)
@@ -130,6 +139,7 @@ case ${ACCESS} in
 		gct -s -t string /desktop/gnome/applications/at/visual/exec orca
 		gct -s -t bool /apps/gksu/disable-grab true
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
+		sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
 		if [ -x /root/usr/bin/orca ]
 		then