Merging casper 1.206.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 0ac3653..f2b5d09 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.206) karmic; urgency=low
+
+  * Fix broken /cdrom writable test in 43disable_initramfs
+    (LP: #450259).
+
+ -- Evan Dandrea <evand@ubuntu.com>  Thu, 22 Oct 2009 11:49:15 +0100
+
 casper (1.205) karmic; urgency=low
 
   * scripts/casper-bottom/25configure_init: Disable sreadahead on live CD

diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs
index 6ceeacf..0a6c7c0 100755 (executable)
--- a/scripts/live-bottom/43disable_updateinitramfs
+++ b/scripts/live-bottom/43disable_updateinitramfs
@@ -31,7 +31,8 @@ chroot /root dpkg-divert --add --rename --quiet \
 
 # Running off a USB disk or other writable media.
 if [ -w /root/cdrom ] && \
-   ! grep -q '^[^ ]* /root/cdrom [^ ]* [^ ]*\<ro\>' /proc/mounts
+   # rw is guaranteed to be first.
+   grep -q ' /root/cdrom rw[, ]' /proc/self/mountinfo
 then
 
 cat > /root/usr/sbin/update-initramfs << 'EOF'