From 463388f48b6e95e0538222ecaff7abd302959b31 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Tue, 18 Feb 2014 17:52:39 +0000 Subject: [PATCH] Wait for Tor to have fully bootstrapped before checking for upgrades (partly closes: #6728). --- .../usr/local/bin/tails-upgrade-frontend-wrapper | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper b/config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper index 4508a613a4..60b7fa550c 100755 --- a/config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper +++ b/config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper @@ -60,15 +60,10 @@ See https://tails.boum.org/doc/first_steps/upgrade#manual\"`" ### Main -# wait for the $TORDATE_DIR directory to appear -while [ ! -d "$TORDATE_DIR" ]; do - sleep 10 +while ! sudo -n -u debian-tor /usr/local/sbin/tor-has-bootstrapped ; do + sleep 10 done -# wait for a guarantee that time is in Tor valid range -while ! [ -e "$TORDATE_DONE_FILE" ]; do - inotifywait -q -t "$INOTIFY_TIMEOUT" -e create --format %w%f "$TORDATE_DIR" -done check_free_memory "$MIN_MEMFREE" "$MIN_TOTAL_MEMFREE" -- GitLab