Merging casper 1.231.

diff --git a/debian/live-initramfs.init b/debian/live-initramfs.init
index da461b5..ac7cd8e 100644 (file)
--- a/debian/live-initramfs.init
+++ b/debian/live-initramfs.init
@@ -137,7 +137,7 @@ do_stop ()
                prompt=
        fi
 
-       for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty)
+       for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth /sbin/usplash_write
        do
                cache_path "${path}"
        done

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 7bce74e..7d3a3e0 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,22 @@
+casper (1.231) lucid; urgency=low
+
+  [ Jonathan Riddell ]
+  * Remove 37kubuntu_netbook_installer_link, now done with a patch in
+    kdebase-workspace
+
+  [ Colin Watson ]
+  * If copying live media to RAM or disk, explicitly copy .disk, since *
+    won't expand to include it (LP: #526305).
+  * Cache /bin/plymouth and /sbin/usplash_write before ejecting the CD, in
+   the hope that that helps with I/O errors on reboot (see LP #539027).
+
+  [ Luke Yelavich ]
+  * ubiquity-hooks/30accessibility: Copy the orca settings directory to the
+    gdm home directory, to allow for preferred orca settings to be used in
+    gdm (LP: #551515).
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Fri, 09 Apr 2010 14:00:51 +1000
+
 casper (1.230) lucid; urgency=low
 
   * Don't save the hardware clock on live CD reboot; we used to do this in

diff --git a/scripts/live b/scripts/live
index cdcbc18..7acf0d9 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -759,7 +759,11 @@ copy_live_to ()
                                rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console  # "cp -a" from busybox also copies hidden files
                        else
                                mkdir -p ${copyto}/${LIVE_MEDIA_PATH}
-                               cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}   # "cp -a" from busybox also copies hidden files
+                               cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}
+                               if [ -e ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ]
+                               then
+                                       cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ${copyto}
+                               fi
                        fi
                fi