From c5737373d1462481ec5e5ebd1280ed37ce90ac10 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Apr 2010 20:41:52 +0200
Subject: [PATCH] Adding upstream version 1.128.1.

---
 docs/ChangeLog.casper               | 21 +++++++++++++++++++++
 hooks/live                          |  6 ++++++
 scripts/live                        |  8 ++++----
 scripts/live-bottom/30accessibility | 12 ++++++++----
 4 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 5368005..6e990b5 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,24 @@
+casper (1.128) hardy; urgency=low
+
+  [ Luke Yelavich ]
+  * scripts/casper-bottom/30accessibility &
+    ubiquity-hooks/30accessibility:
+    - Update gconf keys to ensure onboard actually gets loaded.
+    - Change ownership of created orca settings files to the user.
+    - Add extra bits to make orca settings actually work.
+
+  [ Evan Dandrea ]
+  * Add mode=755 to the tmpfs mount that becomes / in the unionfs mount
+    so that / in the live filesystem does not end up with 777 permissions
+    (LP: #206030).
+
+  [ Colin Watson ]
+  * Make scripts/casper-bottom/38disable_restricted_manager executable
+    again.
+  * Depend on uuid-runtime for uuidgen.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 31 Mar 2008 18:11:55 +0100
+
 casper (1.127) hardy; urgency=low
 
   * Leave spawning the noninteractive ubiquity frontend to its initscript.
diff --git a/hooks/live b/hooks/live
index a4aced3..5c00534 100755
--- a/hooks/live
+++ b/hooks/live
@@ -126,3 +126,9 @@ if [ -x /usr/bin/wget ]
 then
 	copy_exec /usr/bin/wget /bin
 fi
+
+# Fix missing klibc deps
+for hidden_klibc_dep_library in libacl libblkid libuuid libdevmapper libattr
+do
+	cp -a /lib/${hidden_klibc_dep_library}.so.* ${DESTDIR}/lib
+done
diff --git a/scripts/live b/scripts/live
index 797f5df..46dcb74 100755
--- a/scripts/live
+++ b/scripts/live
@@ -982,7 +982,7 @@ setup_unionfs ()
 			fi
 
 			mkdir -p "${croot}/${imagename}"
-			echo "debug: Can not mount backdev ${backdev} (image = ${image}) on croot/imagename ${croot}/${imagename}"
+			echo "debug: Mounting backdev \"${backdev}\" (image = ${image}) on croot/imagename \"${croot}/${imagename}\""
 			mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
 		fi
 	done
@@ -1058,10 +1058,10 @@ setup_unionfs ()
 		[ "${quiet}" != "y" ] && log_begin_msg \
 			"Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
 		nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
-			panic "Can not mount ${cowdevice} on /cow"
+			panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
 	else
-		mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || \
-			panic "Can not mount ${cowdevice} on /cow"
+		mount -t ${cow_fstype} -o rw,noatime ${cowdevice} /cow || \
+			panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
 	fi
 
 	rofscount=$(echo ${rofslist} |wc -w)
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 6b61db1..6bfcc45 100755
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -67,8 +67,10 @@ case ${ACCESS} in
 		if type orca > /dev/null 2>&1
 		then
 			mkdir -p /root/home/${USERNAME}/.orca
-			echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/orca-customizations.py
-			echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
+			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
+			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
 		fi
 		;;
 
@@ -92,8 +94,10 @@ case ${ACCESS} in
 		if type orca > /dev/null 2>&1
 		then
 			mkdir -p /root/home/${USERNAME}/.orca
-			echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/orca-customizations.py
-			echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/orca-customizations.py
+			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
+			chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
 		fi
 		;;
 
-- 
2.1.4