summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-07-31 22:38:49 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:00 +0100
commitd50b5b1476237e72ca8fe362eee3a7005a4c0cb3 (patch)
tree948bb2082644fbda88a5f6c925885290572de972 /scripts
parenteabd839b32b303c4176a891d2d42a1aeef8fc2da (diff)
downloadlive-boot-d50b5b1476237e72ca8fe362eee3a7005a4c0cb3.tar.gz
live-boot-d50b5b1476237e72ca8fe362eee3a7005a4c0cb3.zip
Set default cow_mountopt where the other defaults are used.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/live b/scripts/live
index 2cfa5e1..867efc0 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1109,6 +1109,7 @@ setup_unionfs ()
else
cowdevice="tmpfs"
cow_fstype="tmpfs"
+ cow_mountopt="rw,noatime,mode=755"
fi
if [ "${cow_fstype}" = "nfs" ]
@@ -1118,8 +1119,6 @@ setup_unionfs ()
nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
else
- # make sure cow_mountopt is set:
- [ -n "$cow_mountopt" ] || cow_mountopt="rw,noatime,mode=755"
mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
fi