From a8b46858f239db00a07d1ff482eaff21e61e8b46 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Tue, 8 Nov 2011 20:44:11 +0100 Subject: Adding persistent-storage=TYPE... The comma-separated list TYPE... specifies which types of persistent storage to use. Current possible TYPEs are {file, filesystem}. For instance, persistent-storage=filesystem is equivalent to the old persistent=nofiles, but persistent-storage=file allows to look for only files, which wasn't possible before. The default is to look for both, i.e. persistent-storage=filesystem,file. --- scripts/live-helpers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/live-helpers') diff --git a/scripts/live-helpers b/scripts/live-helpers index 484ec93..f67e421 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -369,13 +369,13 @@ find_cow_device () done fi - if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ] + if echo ${PERSISTENT_STORAGE} | grep -qw filesystem && [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ] then echo "${devname}" return 0 fi - if [ "${PERSISTENT}" = "nofiles" ] + if ! echo ${PERSISTENT_STORAGE} | grep -qw file then # do not mount the device to find for image files # just skip this -- cgit v1.2.3