From 5b69e4b92b73d30b9efedcc291cfb45e2ec10a37 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 26 Oct 2009 13:51:13 +0100 Subject: [PATCH] Merging casper 1.172. --- docs/ChangeLog.casper | 7 +++++++ 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 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 [^ ]* [^ ]*\' /proc/mounts; then +if [ -w /root/cdrom ] && \ + ! grep -q '^[^ ]* /root/cdrom [^ ]* [^ ]*\' /proc/mounts then cat > /root/usr/sbin/update-initramfs << 'EOF' -- 2.1.4