diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 12:16:30 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:08 +0100 |
| commit | 2820ba301e0fab0979e5e6b705ece3f01afcf2c8 (patch) | |
| tree | 9c18f69eb448e827d30bdc2930dea8cdde710172 | |
| parent | 8eb002767205358584bcf7125e8da19893ee4e33 (diff) | |
| download | live-boot-2820ba301e0fab0979e5e6b705ece3f01afcf2c8.tar.gz live-boot-2820ba301e0fab0979e5e6b705ece3f01afcf2c8.zip | |
Merging casper 1.206.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rwxr-xr-x | scripts/live-bottom/43disable_updateinitramfs | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 0ac3653..f2b5d09 100644 --- 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 --- 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' |