summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live6
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