Correct eject login in initscript.

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

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index d838d76..51780d2 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -47,6 +47,15 @@ gct ()
        fi
 }
 
+laptop_detect ()
+{
+       if chroot /root /usr/sbin/laptop-detect
+       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
+       fi
+}
+
 case ${ACCESS} in
        access=v1)
                # Lesser Visual Impairment
@@ -67,6 +76,8 @@ case ${ACCESS} in
        access=v2)
                # Moderate Visual Impairment
                gct -s -t bool /desktop/gnome/interface/accessibility true
+               gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+               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
 
@@ -76,11 +87,8 @@ case ${ACCESS} in
                        echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+                       laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
-
-                       mkdir -p /root/home/${USERNAME}/.config/autostart
-                       cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
-                       chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
                fi
                ;;
 
@@ -89,20 +97,18 @@ case ${ACCESS} in
                # Disabled for now, until we know eSpeak works.
                #gct -s -t bool /desktop/gnome/sound/enable_esd false
                gct -s -t bool /desktop/gnome/interface/accessibility true
+               gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+               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
 
-               if [ -x /root/usr/bin/orca ]
-               then
-                       mkdir -p /root/home/${USERNAME}/.config/autostart
-                       cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
-                       chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
-               fi
                ;;
 
        braille=ask)
                # Braille
                gct -s -t bool /desktop/gnome/interface/accessibility true
+               gct -s -t bool /desktop/gnome/applications/at/visual/startup true
+               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
 
@@ -112,11 +118,8 @@ case ${ACCESS} in
                        echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
                        echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/user-settings.py
+                       laptop_detect
                        chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
-
-                       mkdir -p /root/home/${USERNAME}/.config/autostart
-                       cp /root/usr/share/applications/orca.desktop /root/home/${USERNAME}/.config/autostart
-                       chroot /root chown -R ${USERNAME}.${USERNAME} /home/${USERNAME}/.config
                fi
                ;;