summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-05-01 12:16:30 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:08 +0100
commit2820ba301e0fab0979e5e6b705ece3f01afcf2c8 (patch)
tree9c18f69eb448e827d30bdc2930dea8cdde710172 /scripts
parent8eb002767205358584bcf7125e8da19893ee4e33 (diff)
downloadlive-boot-2820ba301e0fab0979e5e6b705ece3f01afcf2c8.tar.gz
live-boot-2820ba301e0fab0979e5e6b705ece3f01afcf2c8.zip
Merging casper 1.206.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live-bottom/43disable_updateinitramfs3
1 files changed, 2 insertions, 1 deletions
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'