tailscale_hook: add timeout (default 20s)

this should ensure that initialisation doesn't hang if not logged in or network isn't available
classabbyamp · Sep 12, 2023 · 1451e0e · 1451e0e
1 parent a123050
commit 1451e0e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ sourced as a busybox ash shell script.
 
     tailscale_port:    argument to -port (default: 41641)
     tailscaled_args:   other args to pass to tailscaled
+    tailscale_timeout: argument to --timeout (default: 20s)
     tailscale_args:    other args to pass to tailscale up
 
 > Note: This project is not affiliated with Tailscale in any way

diff --git a/tailscale_hook b/tailscale_hook
@@ -11,7 +11,7 @@ run_hook() {
 	(
 		[ -r /etc/tailscale/tailscaled.conf ] && . /etc/tailscale/tailscaled.conf
 		tailscaled -state "/etc/tailscale/tailscaled.state" -port "${tailscale_port:-41641}" $tailscaled_args &
-		tailscale up $tailscale_args
+		tailscale up --timeout="${tailscale_timeout:-20s}" $tailscale_args
 	)
 }
 

diff --git a/tailscale_install b/tailscale_install
@@ -38,6 +38,7 @@ help() {
 
 	  tailscale_port:    argument to -port (default: 41641)
 	  tailscaled_args:   other args to pass to tailscaled
+	  tailscale_timeout: argument to --timeout (default: 20s)
 	  tailscale_args:    other args to pass to tailscale up
 	
 	See the README for security considerations and full setup instructions.