Commit b8d2ba23 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'feature/live-persist_guess_removable' into devel

parents ae27840f c47622cf
......@@ -149,7 +149,15 @@ list_gpt_volumes ()
[ -z "${whitelistdev}" ] && return
;;
*)
whitelistdev=""
if grep -qs -w -E '(live-media|bootfrom)=removable-usb' /proc/cmdline ; then
whitelistdev="$(removable_usb_dev)"
[ -z "${whitelistdev}" ] && return
elif grep -qs -w -E '(live-media|bootfrom)=removable' /proc/cmdline ; then
whitelistdev="$(removable_dev)"
[ -z "${whitelistdev}" ] && return
else
whitelistdev=""
fi
;;
esac
......
--- a/usr/lib/python2.6/dist-packages/GdmGreeter/persistence.py 2012-12-31 18:21:00.324004572 +0000
+++ b/usr/lib/python2.6/dist-packages/GdmGreeter/persistence.py 2012-12-31 18:21:17.308004822 +0000
@@ -45,7 +45,7 @@
[
"/usr/bin/sudo", "-n", "/usr/local/sbin/live-persist",
"--log-file=/var/log/live-persist",
- "--encryption=luks", "--media=removable",
+ "--encryption=luks",
"list", "TailsData"
],
stdout=subprocess.PIPE,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment