From d50b5b1476237e72ca8fe362eee3a7005a4c0cb3 Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Thu, 31 Jul 2008 22:38:49 +0100 Subject: [PATCH] Set default cow_mountopt where the other defaults are used. --- scripts/live | 3 +-- 1 file changed, 1 insertion(+), 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 -- 2.1.4