Remove duplicate status checks from dependent S6 services (#196)

hassio-addons · Oct 15, 2023 · 5e26744 · 5e26744
1 parent 92122ba
commit 5e26744
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/tailscale/rootfs/etc/s6-overlay/s6-rc.d/post-tailscaled/run b/tailscale/rootfs/etc/s6-overlay/s6-rc.d/post-tailscaled/run
@@ -92,4 +92,17 @@ do
   sleep 2
 done
 
-/opt/tailscale up "${options[@]}"
+# Start Tailscale
+if ! /opt/tailscale up "${options[@]}"; then
+  bashio::log.error "Unable to start up Tailscale"
+  bashio::exit.nok
+fi
+
+# Wait for the network to be available and logged in
+while ! /opt/tailscale status --json --peers=false --self=false \
+  | jq --exit-status '.BackendState == "Running"' > /dev/null
+do
+  sleep 2
+done
+
+bashio::log.info "Tailscale is running"
diff --git a/tailscale/rootfs/etc/s6-overlay/s6-rc.d/proxy/run b/tailscale/rootfs/etc/s6-overlay/s6-rc.d/proxy/run
@@ -7,14 +7,6 @@
 
 declare domain
 
-# Wait for the network to be available and logged in
-while ! bashio::fs.socket_exists "/var/run/tailscale/tailscaled.sock" || \
-  ! /opt/tailscale status --json --peers=false --self=false \
-    | jq --exit-status '.BackendState == "Running"' > /dev/null
-do
-  sleep 2
-done
-
 # Check if Tailscale HTTPS is enabled
 if ! /opt/tailscale status --self=true --peers=false --json \
   | jq -rce ".CertDomains[0]" > /dev/null;

diff --git a/tailscale/rootfs/etc/s6-overlay/s6-rc.d/taildrop/run b/tailscale/rootfs/etc/s6-overlay/s6-rc.d/taildrop/run
@@ -5,14 +5,6 @@
 # Fetches files send via Taildrop
 # ==============================================================================
 
-# Wait for the network to be available and logged in
-while ! bashio::fs.socket_exists "/var/run/tailscale/tailscaled.sock" || \
-  ! /opt/tailscale status --json --peers=false --self=false \
-    | jq --exit-status '.BackendState == "Running"' > /dev/null
-do
-  sleep 2
-done
-
 # Ensure the directory exists
 mkdir -p /share/taildrop