diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-03-26 07:50:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:47:58 +0100 |
| commit | f9df46ac956501647ceb278f33979f6660df4507 (patch) | |
| tree | 77bcc128fadf1bf0653be76cba4311b2fd15c74a /scripts | |
| parent | a39461e281338dd48bdb08b3b31ec0c61b4a2bf0 (diff) | |
| download | live-boot-f9df46ac956501647ceb278f33979f6660df4507.tar.gz live-boot-f9df46ac956501647ceb278f33979f6660df4507.zip | |
scripts/live: Make 'nopersistent' parameter actually disable persistence
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/live b/scripts/live index 03905b5..7632fc8 100755 --- a/scripts/live +++ b/scripts/live @@ -992,7 +992,7 @@ setup_unionfs () mkdir -p /cow # Looking for "${root_persistence}" device or file - if [ -n "${PERSISTENT}" ] + if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] then cowprobe=$(find_cow_device "${root_persistence}") @@ -1005,7 +1005,7 @@ setup_unionfs () cowdevice="tmpfs" cow_fstype="tmpfs" fi - elif [ -n "${NFS_COW}" ] + elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ] then # check if there are any nfs options if echo ${NFS_COW}|grep -q ',' @@ -1075,7 +1075,7 @@ setup_unionfs () mount -t tmpfs tmpfs ${rootmnt}/live # Adding other custom mounts - if [ -n "${PERSISTENT}" ] + if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] then # directly mount /home # FIXME: add a custom mounts configurable system |