Merging casper 1.169.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 59e09ef..a62e48c 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,17 @@
+casper (1.169) jaunty; urgency=low
+
+  * [ -w /cdrom ] turns out not to be a sufficient test for files under
+    /cdrom being writable; with busybox, it always returns true even for
+    read-only filesystems. Explicitly check for the read-only flag in mount
+    output to work around this.
+  * Fix where_is_mounted helper function to actually produce output (thanks,
+    Steve Dodd; LP: #346941).
+  * Add a comment to find_cow_device explaining why the choice of
+    filesystems is restricted (I asked for this comment in LP #230703 but it
+    apparently never got written).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 07 Apr 2009 01:47:05 +0100
+
 casper (1.168) jaunty; urgency=low
 
   * Fix writing of "$@" to diverted update-initramfs script (here-documents

diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs
index fa0ecac..2b60315 100755 (executable)
--- a/scripts/live-bottom/43disable_updateinitramfs
+++ b/scripts/live-bottom/43disable_updateinitramfs
@@ -30,7 +30,8 @@ chroot /root dpkg-divert --add --rename --quiet \
        /usr/sbin/update-initramfs
 
 # Running off a USB disk or other writable media.
-if [ -w /cdrom ]
+if [ -w /cdrom ] && \
+   ! grep -q '^[^ ]* /cdrom [^ ]* [^ ]*\<ro\>' /proc/mounts; then
 then
 
 cat > /root/usr/sbin/update-initramfs << 'EOF'