Set default cow_mountopt where the other defaults are used.
authorChris Lamb <chris@chris-lamb.co.uk>
Thu, 31 Jul 2008 21:38:49 +0000 (22:38 +0100)
committerDaniel Baumann <daniel@debian.org>
Wed, 9 Mar 2011 16:48:00 +0000 (17:48 +0100)
scripts/live

index 2cfa5e1..867efc0 100755 (executable)
@@ -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