summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-03-09 23:20:46 +0000
committerintrigeri <intrigeri@boum.org>2015-03-10 00:12:48 +0000
commitca870ffc691f8515780336e193cc52c92c215ae4 (patch)
tree519ceb8cea46bd70fa763e98375bd59d3460c2ae
parent2f96f867bca8351bbd51e0f95dd8e5f1835155af (diff)
Convert the remote shell to Python 3.
This will be needed in order to use the systemd daemon readiness protocol (aka. sd_notify).
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/tails-autotest-remote-shell6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/chroot_local-includes/usr/local/lib/tails-autotest-remote-shell b/config/chroot_local-includes/usr/local/lib/tails-autotest-remote-shell
index 69951e4..02b1f34 100755
--- a/config/chroot_local-includes/usr/local/lib/tails-autotest-remote-shell
+++ b/config/chroot_local-includes/usr/local/lib/tails-autotest-remote-shell
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# ATTENTION: Yes, this can be used as a backdoor, but only for an
# adversary with access to you *physical* serial port, which means
@@ -54,7 +54,7 @@ def main():
except Exception as e:
# port must be opened wrong, so we restart everything and pray
# that it works.
- print str(e)
+ print(str(e))
port.close()
return main()
try:
@@ -62,7 +62,7 @@ def main():
except Exception as e:
# We had a parse/pack error, so we just send a \0 as an ACK,
# releasing the client from blocking.
- print str(e)
+ print(str(e))
port.write("\0")
continue
p = run_cmd_as_user(cmd, user)