From: Daniel Baumann <daniel@debian.org>
Date: Fri, 4 Apr 2008 08:27:45 +0000 (+0200)
Subject: Merging casper 1.128.
X-Git-Tag: debian/2.0.15-1~565
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=b41681e37771dbf21bfc0ecc7a8c64af21552123;p=live-boot-grml.git

Merging casper 1.128.
---

diff --git a/debian/control b/debian/control
index 4b15051..41e7d1b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ XS-Upstream-Depends: git-core
 Package: live-initramfs
 Architecture: all
 Depends: ${misc:Depends}, busybox, file, initramfs-tools, sudo, udev, user-setup
-Recommends: eject, wget
+Recommends: eject, uuid-runtime, wget
 Suggests: genext2fs, squashfs-tools, mtd-tools
 Description: Debian Live initramfs hook
  live-initramfs is a hook for the initramfs-tools, used to generate a initramfs
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/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
 		;;