summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes/lib
diff options
context:
space:
mode:
Diffstat (limited to 'config/chroot_local-includes/lib')
-rw-r--r--config/chroot_local-includes/lib/systemd/system/tails-tor-has-bootstrapped.target10
-rw-r--r--config/chroot_local-includes/lib/systemd/system/tails-wait-until-tor-has-bootstrapped.service5
2 files changed, 7 insertions, 8 deletions
diff --git a/config/chroot_local-includes/lib/systemd/system/tails-tor-has-bootstrapped.target b/config/chroot_local-includes/lib/systemd/system/tails-tor-has-bootstrapped.target
index 0aca04f..e514116 100644
--- a/config/chroot_local-includes/lib/systemd/system/tails-tor-has-bootstrapped.target
+++ b/config/chroot_local-includes/lib/systemd/system/tails-tor-has-bootstrapped.target
@@ -1,10 +1,8 @@
[Unit]
-Description=Tor has bootstrapped
+Description=Tor has Bootstrapped
Documentation=https://tails.boum.org/contribute/design/
-Requires=graphical.target
-Conflicts=rescue.service rescue.target
-After=graphical.target rescue.service rescue.target
-AllowIsolate=yes
+After=tails-wait-until-tor-has-bootstrapped.service
+BindsTo=tails-wait-until-tor-has-bootstrapped.service
[Install]
-WantedBy=graphical.target
+WantedBy=tails-wait-until-tor-has-bootstrapped.service \ No newline at end of file
diff --git a/config/chroot_local-includes/lib/systemd/system/tails-wait-until-tor-has-bootstrapped.service b/config/chroot_local-includes/lib/systemd/system/tails-wait-until-tor-has-bootstrapped.service
index 64f2afd..853aac7 100644
--- a/config/chroot_local-includes/lib/systemd/system/tails-wait-until-tor-has-bootstrapped.service
+++ b/config/chroot_local-includes/lib/systemd/system/tails-wait-until-tor-has-bootstrapped.service
@@ -2,10 +2,11 @@
Description=Wait for Tor to Have Bootstrapped
Documentation=https://tails.boum.org/contribute/design/
After=tor@default.service
-Before=tails-tor-has-bootstrapped.target
+BindsTo=tor@default.service
[Service]
Type=oneshot
+RemainAfterExit=yes
User=debian-tor
ExecStart=/bin/sh -c '. /usr/local/lib/tails-shell-library/tor.sh ; \
while ! tor_is_working ; do \
@@ -19,4 +20,4 @@ ProtectHome=yes
ProtectSystem=full
[Install]
-WantedBy=tails-tor-has-bootstrapped.target
+WantedBy=tor@default.service \ No newline at end of file