diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-10-26 13:47:08 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:06 +0100 |
| commit | 3f682b4344b8b6fb0e8478ce684783f183c4802d (patch) | |
| tree | 5386ebeb495784219c427efb1248fa7a2560de1f | |
| parent | c61a099f9f482a9824ea71713e91c8637ef5cc99 (diff) | |
| download | live-boot-3f682b4344b8b6fb0e8478ce684783f183c4802d.tar.gz live-boot-3f682b4344b8b6fb0e8478ce684783f183c4802d.zip | |
Merging casper 1.169.
| -rw-r--r-- | docs/ChangeLog.casper | 14 | ||||
| -rwxr-xr-x | scripts/live-bottom/43disable_updateinitramfs | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 59e09ef..a62e48c 100644 --- 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 --- 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' |