summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-11-11 18:14:20 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:03 +0100
commit89bcde16a95dfd84c653cb95b9a5ab966fd8d4da (patch)
tree35c81184543c4396590c1dfd32bf5f9e1742c410 /scripts
parent84ec5ec4ecd84b384411b376b936e41b0d79af46 (diff)
downloadlive-boot-89bcde16a95dfd84c653cb95b9a5ab966fd8d4da.tar.gz
live-boot-89bcde16a95dfd84c653cb95b9a5ab966fd8d4da.zip
Merging casper 1.148.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/live-helpers6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/live-helpers b/scripts/live-helpers
index a935001..f6b8b8b 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -275,7 +275,11 @@ try_mount ()
if [ -n "${old_mountp}" ]
then
- mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+ if [ "${opts}" != "ro" ]
+ then
+ mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+ fi
+
mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
else
if [ -z "${fstype}" ]