[SCM] debian-live/live-initramfs branch, master, updated. 1.125.1-1-7-g39f6aa4
Chris Lamb
chris at chris-lamb.co.uk
Wed Mar 26 08:57:06 UTC 2008
The following commit has been merged in the master branch:
commit 0fdb18f91a0b4e692065bc25d3c6606db65ad14e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Wed Mar 26 07:50:42 2008 +0000
scripts/live: Make 'nopersistent' parameter actually disable persistence
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
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
--
debian-live/live-initramfs
More information about the debian-live-changes
mailing list