[SCM] debian-live branch, master, updated. debian/1.136.3-1-3-gc692341
Chris Lamb
chris at chris-lamb.co.uk
Thu Jul 31 21:48:24 UTC 2008
The following commit has been merged in the master branch:
commit c69234121f7802262d691b2524958f8ea35dda6a
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Thu Jul 31 22:38:49 2008 +0100
Set default cow_mountopt where the other defaults are used.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
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
--
debian-live
More information about the debian-live-changes
mailing list