summaryrefslogtreecommitdiff
path: root/scripts/live-helpers
diff options
context:
space:
mode:
authorMarco Amadori <marco.amadori@gmail.com>2008-08-22 11:29:57 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:01 +0100
commit3fa29d4e1c65f412e5c9bf12ef18d01783f30cae (patch)
tree6cbbe9a49d4dcf4a14bdaa220fbf03d5afc47127 /scripts/live-helpers
parentdbfb79c47964978158714037bf1d77f7390daf8c (diff)
downloadlive-boot-3fa29d4e1c65f412e5c9bf12ef18d01783f30cae.tar.gz
live-boot-3fa29d4e1c65f412e5c9bf12ef18d01783f30cae.zip
Added "-n" option to all mount commands, thanks to Peter Holik <peter@holik.at> for pointing this out.
Diffstat (limited to 'scripts/live-helpers')
-rw-r--r--scripts/live-helpers8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/live-helpers b/scripts/live-helpers
index bb5653c..70c7f34 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -146,7 +146,7 @@ fs_size ()
mountp="/mnt/tmp_fs_size"
mkdir -p "${mountp}"
- mount -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}"
+ mount -n -t $(get_fstype "${dev}") -o ro "${dev}" "${mountp}"
doumount=1
fi
@@ -274,10 +274,10 @@ try_mount ()
if [ -n "${old_mountp}" ]
then
- mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
- mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
+ mount -n -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+ mount -n -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
else
- mount -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
+ mount -n -t $(get_fstype "${dev}") -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}"
fi
}