diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-07-14 09:55:14 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:00 +0100 |
| commit | ee9e8d389f1ee6ccda3cf1726884b98c34847158 (patch) | |
| tree | 8b173b179b2671f5dc8e8ee62bdec18797c6a9b6 | |
| parent | 8225101cbf7a069f0d4ff6d5fda4677051d8821a (diff) | |
| download | live-boot-ee9e8d389f1ee6ccda3cf1726884b98c34847158.tar.gz live-boot-ee9e8d389f1ee6ccda3cf1726884b98c34847158.zip | |
Merging casper version 1.134.
| -rw-r--r-- | docs/ChangeLog.casper | 11 | ||||
| -rwxr-xr-x | scripts/live | 4 |
2 files changed, 14 insertions, 1 deletions
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 |