From: Daniel Baumann <daniel@debian.org>
Date: Mon, 26 Oct 2009 12:14:31 +0000 (+0100)
Subject: Merging casper 1.158.
X-Git-Tag: debian/2.0.15-1~257
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=9a4b1e916f10c04e516b4801ea7a7995d6ddcc11;p=live-boot-grml.git

Merging casper 1.158.
---

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 31d5e92..d604bc5 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.158) jaunty; urgency=low
+
+  * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
+    - use laptop_detect function in blindness profile as well
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Mon, 09 Mar 2009 14:07:17 +1100
+
 casper (1.157) jaunty; urgency=low
 
   [ Emmet Hikory ]
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 3ff3fda..90312f6 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
 }
 
@@ -121,6 +125,7 @@ case ${ACCESS} in
 		gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
 
 		remove_applet fast_user_switch
+		laptop_detect
 		;;
 
 	braille=ask)