diff options
| author | Tails developers <amnesia@boum.org> | 2011-11-23 12:08:06 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-11-24 09:42:09 +0100 |
| commit | 63915a0a5d619edf49004a2a73d61118f60f8551 (patch) | |
| tree | fa465397d124da481251afd4f5dc2f9f3b5b0e38 /scripts | |
| parent | c70525edd757583351b41f6f00d7f94fd892bbfa (diff) | |
| download | live-boot-63915a0a5d619edf49004a2a73d61118f60f8551.tar.gz live-boot-63915a0a5d619edf49004a2a73d61118f60f8551.zip | |
Making persistent-read-only work for live-rw overlays.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 47 | ||||
| -rw-r--r-- | scripts/live-helpers | 4 |
2 files changed, 39 insertions, 12 deletions
diff --git a/scripts/live b/scripts/live index a8ac678..ad481ae 100755 --- a/scripts/live +++ b/scripts/live @@ -1448,16 +1448,17 @@ setup_unionfs () then cowdevice=${cowprobe} cow_fstype=$(get_fstype "${cowprobe}") - cow_mountopt="rw,noatime" + if [ -z "${PERSISTENT_READONLY}" ] + then + cow_mountopt="rw,noatime" + else + cow_mountopt="ro,noatime" + fi if [ "${FORCEPERSISTENTFSCK}" = "Yes" ] then fsck -y ${cowdevice} fi - else - cowdevice="tmpfs" - cow_fstype="tmpfs" - cow_mountopt="rw,noatime,mode=755" fi elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ] then @@ -1470,6 +1471,12 @@ setup_unionfs () nfs_cow_opts="-o nolock" nfs_cow=${NFS_COW} fi + + if [ -n "${PERSISTENT_READONLY}" ] + then + nfs_cow_opts="${nfs_cow_opts},nocto,ro" + fi + mac="$(get_mac)" if [ -n "${mac}" ] then @@ -1478,7 +1485,10 @@ setup_unionfs () else panic "unable to determine mac address" fi - else + fi + + if [ -z "${cowdevice}" ] + then cowdevice="tmpfs" cow_fstype="tmpfs" cow_mountopt="rw,noatime,mode=755" @@ -1486,16 +1496,23 @@ setup_unionfs () if [ "${UNIONTYPE}" != "unionmount" ] then + if [ -n "${PERSISTENT_READONLY}" ] + then + persistent_root="/$(basename ${cowdevice})-backing" + mkdir -p ${persistent_root} + else + persistent_root="/cow" + fi if [ "${cow_fstype}" = "nfs" ] then log_begin_msg \ - "Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow" - nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \ - panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow" + "Trying nfsmount ${nfs_cow_opts} ${cowdevice} ${persistent_root}" + nfsmount ${nfs_cow_opts} ${cowdevice} ${persistent_root} || \ + panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on ${persistent_root}" else - mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \ - panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow" + mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} ${persistent_root} || \ + panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on ${persistent_root}" fi fi @@ -1555,7 +1572,13 @@ setup_unionfs () *) - unionmountopts="-o noatime,${noxino_opt}dirs=${unionrw}=rw:${unionro}=${roopt}" + if [ -n "${PERSISTENT_READONLY}" ] + then + mount -t tmpfs -o rw,noatime,mode=755 tmpfs "${unionrw}" + unionmountopts="-o noatime,${noxino_opt}dirs=${unionrw}=rw:${persistent_root}=${roopt}:${unionro}=${roopt}" + else + unionmountopts="-o noatime,${noxino_opt}dirs=${unionrw}=rw:${unionro}=${roopt}" + fi mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; esac || \ diff --git a/scripts/live-helpers b/scripts/live-helpers index 9e45517..976189a 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -316,6 +316,10 @@ open_luks_device () dev="${1}" name="$(basename ${dev})" opts="--key-file=-" + if [ -n "${PERSISTENT_READONLY}" ] + then + opts="${opts} --readonly" + fi load_keymap |