From: Daniel Baumann <daniel@debian.org>
Date: Mon, 14 Jul 2008 07:55:14 +0000 (+0200)
Subject: Merging casper version 1.134.
X-Git-Tag: debian/2.0.15-1~507
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=ee9e8d389f1ee6ccda3cf1726884b98c34847158;p=live-boot-grml.git

Merging casper version 1.134.
---

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 3425af4..341ae68 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,14 @@
+casper (1.134) intrepid; urgency=low
+
+  [ Evan Dandrea ]
+  * Do not use mode= when mounting /cow using persistent mode (LP: #219192).
+
+  [ Colin Watson ]
+  * Support ?= (set value but don't mark as seen) preseeding syntax for
+    console-setup/* (LP: #64058).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 30 Jun 2008 23:52:41 +0100
+
 casper (1.133) intrepid; urgency=low
 
   [ Tormod Volden ]
diff --git a/scripts/live b/scripts/live
index bf30b50..fcaf1ec 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1064,10 +1064,12 @@ setup_unionfs ()
 		then
 			cowdevice=${cowprobe}
 			cow_fstype=$(get_fstype "${cowprobe}")
+			cow_mountopt="rw,noatime"
 		else
 			[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
 			cowdevice="tmpfs"
 			cow_fstype="tmpfs"
+			cow_mountopt="rw,noatime,mode=755"
 		fi
 	elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ]
 	then
@@ -1100,7 +1102,7 @@ setup_unionfs ()
 		nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
 			panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
 	else
-		mount -t ${cow_fstype} -o rw,noatime ${cowdevice} /cow || \
+		mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
 			panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
 	fi