[SCM] debian-live branch, master, updated. 1.136.2-1-1-g0e9d670

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 0e9d6705be8b39a965fb082118f3bee65c6d8a5a
Author: Michael Prokop <mika at grml.org>
Date:   Thu Jul 17 13:23:00 2008 +0200

    Make sure mounting /cow-tmpfs provides mount options.

diff --git a/scripts/live b/scripts/live
index 15710c2..22d2210 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1118,6 +1118,8 @@ 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