summaryrefslogtreecommitdiff
path: root/scripts/live
diff options
context:
space:
mode:
authorAndrey Asadchev <asadchev@gmail.com>2008-02-29 12:01:58 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:31:06 +0100
commit137f616fb77851cf84c0c2b3f99d77f4337424c4 (patch)
tree93b0506533d30e79b89b2ade67641c865aeb502c /scripts/live
parent9171ce28fbec2c18a19730044d1ac2157ccb396b (diff)
downloadlive-boot-137f616fb77851cf84c0c2b3f99d77f4337424c4.tar.gz
live-boot-137f616fb77851cf84c0c2b3f99d77f4337424c4.zip
Patch to use cryptsetup volumes for persistent storage.
Cryptsetup must be used with usual "cryptopts=source=UUID=$(UUID),target=$(TARGET)". For USB devices it may be necessary to specify "rootdelay=$SECONDS" in order to wait for USB media.
Diffstat (limited to 'scripts/live')
-rwxr-xr-xscripts/live7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/live b/scripts/live
index 8db6b80..0280edd 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1171,7 +1171,7 @@ find_livefs ()
fi
# or do the scan of block devices
- for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram)
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-')
do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
@@ -1218,6 +1218,11 @@ set_usplash_timeout ()
mountroot ()
{
+
+ if [ -x /scripts/local-top/cryptroot ]; then
+ /scripts/local-top/cryptroot
+ fi
+
exec 6>&1
exec 7>&2
exec > live.log