diff options
| author | Tails developers <amnesia@boum.org> | 2010-11-01 18:30:19 +0100 |
|---|---|---|
| committer | Tails developers <amnesia@boum.org> | 2011-09-07 17:26:57 +0200 |
| commit | 41112e3945280cb19dab1fed2b224a763e97fe55 (patch) | |
| tree | 44142f5473230241d2d3adfd2b565cdc8259dbab /scripts | |
| parent | 3f02456e392ead3abf36bc181692fcb75c8f16f3 (diff) | |
| download | live-boot-41112e3945280cb19dab1fed2b224a763e97fe55.tar.gz live-boot-41112e3945280cb19dab1fed2b224a763e97fe55.zip | |
Adding support for persistent-media={removable,removable-usb}.
This is e.g. needed when one's threat model does not allow her to trust the
local hard disks.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/scripts/live b/scripts/live index 952d479..c2ad14e 100755 --- a/scripts/live +++ b/scripts/live @@ -253,6 +253,11 @@ Arguments () export PERSISTENT ;; + persistent-media=*) + PERSISTENT_MEDIA="${ARGUMENT#*=}" + export PERSISTENT_MEDIA + ;; + persistent-path=*) PERSISTENT_PATH="${ARGUMENT#persistent-path=}" export PERSISTENT_PATH @@ -1324,6 +1329,7 @@ setup_unionfs () # Looking for "${root_persistence}" device or file if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] then + if [ -z "${QUICKUSBMODULES}" ] then # Load USB modules @@ -1351,6 +1357,18 @@ setup_unionfs () done fi + case "${PERSISTENT_MEDIA}" in + removable) + whitelistdev="$(removable_dev)" + ;; + removable-usb) + whitelistdev="$(removable_usb_dev)" + ;; + *) + whitelistdev="" + ;; + esac + # search for label and files (this could be hugely optimized) cowprobe=$(find_cow_device "${root_persistence}" "${blacklistdev}" "${whitelistdev}") if [ -b "${cowprobe}" ] |