Merging casper 1.230.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 066c0a1..7bce74e 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,17 @@
+casper (1.230) lucid; urgency=low
+
+  * Don't save the hardware clock on live CD reboot; we used to do this in
+    the sysvinit world, but it regressed when we switched to Upstart
+    (thanks, Norm Pierce; LP: #436535).
+  * When running update-initramfs on writable media, update initrd.lz rather
+    than initrd.gz if it's present, and make the update process a bit safer
+    while we're there (LP: #489736).
+  * Handle toram and todisk=DEVICE options on command line (LP: #526305).
+  * Policy version 3.8.4: no changes required.
+  * Convert to source format 3.0 (native).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 30 Mar 2010 11:41:24 +0100
+
 casper (1.229) lucid; urgency=low
 
   [ Jonathan Riddell ]

diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init
index db23f19..c06617f 100755 (executable)
--- a/scripts/live-bottom/25configure_init
+++ b/scripts/live-bottom/25configure_init
@@ -98,7 +98,7 @@ then
        fi
 
        # Avoid clobbering the user's clock
-       rm -f /root/etc/rc?.d/K??hwclock.sh
+       rm -f /root/etc/rc?.d/K??hwclock.sh /root/etc/init/hwclock-save.conf
 fi
 
 # Disable readahead since it doesn't play well with squashfs + unionfs

diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs
index 0a6c7c0..44e2d1f 100755 (executable)
--- a/scripts/live-bottom/43disable_updateinitramfs
+++ b/scripts/live-bottom/43disable_updateinitramfs
@@ -38,9 +38,22 @@ then
 cat > /root/usr/sbin/update-initramfs << 'EOF'
 #!/bin/sh
 
+set -e
+
 update-initramfs.distrib "$@"
-cp /initrd.img /cdrom/live/initrd.gz
-cp /vmlinuz /cdrom/live/vmlinuz
+
+if [ -e /cdrom/live/initrd.lz ]
+then
+       zcat /initrd.img | lzma -9c >/cdrom/live/initrd.lz.new
+       mv /cdrom/live/initrd.lz.new /cdrom/live/initrd.lz
+else
+       cp /initrd.img /cdrom/live/initrd.gz.new
+       mv /cdrom/live/initrd.gz.new /cdrom/live/initrd.gz
+fi
+
+cp /vmlinuz /cdrom/live/vmlinuz.new
+mv /cdrom/live/vmlinuz.new /cdrom/live/vmlinuz
+
 exit 0
 EOF