diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-10-26 13:51:13 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:06 +0100 |
| commit | 5b69e4b92b73d30b9efedcc291cfb45e2ec10a37 (patch) | |
| tree | 93b8a32f54dd88c32957dc407bb732d6af0344cd | |
| parent | 20353bbbac80b82221411825349a0aafc6123632 (diff) | |
| download | live-boot-5b69e4b92b73d30b9efedcc291cfb45e2ec10a37.tar.gz live-boot-5b69e4b92b73d30b9efedcc291cfb45e2ec10a37.zip | |
Merging casper 1.172.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rwxr-xr-x | scripts/live-bottom/43disable_updateinitramfs | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 9ca7b6f..314c55b 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,10 @@ +casper (1.172) jaunty; urgency=low + + * 43disable_updateinitramfs: The /cdrom mount has been moved to + /root/cdrom by the time this script runs, so check that instead. + + -- Colin Watson <cjwatson@ubuntu.com> Thu, 09 Apr 2009 18:30:29 +0100 + casper (1.171) jaunty; urgency=low * Set MP_QUIET to -q instead of -Q on Ubuntu as well, and not just for diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs index 2b60315..6ceeacf 100755 --- a/scripts/live-bottom/43disable_updateinitramfs +++ b/scripts/live-bottom/43disable_updateinitramfs @@ -30,8 +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 ] && \ - ! grep -q '^[^ ]* /cdrom [^ ]* [^ ]*\<ro\>' /proc/mounts; then +if [ -w /root/cdrom ] && \ + ! grep -q '^[^ ]* /root/cdrom [^ ]* [^ ]*\<ro\>' /proc/mounts then cat > /root/usr/sbin/update-initramfs << 'EOF' |