From e354e2647c24cdfcd49397446d0964b5aa0ace69 Mon Sep 17 00:00:00 2001
From: Viktor Liu <viktor@netbird.io>
Date: Sun, 22 Mar 2026 19:01:35 +0100
Subject: [PATCH] Simplify entrypoint by running netbird up unconditionally

---
 client/Dockerfile            |  3 +--
 client/Dockerfile-rootless   |  3 +--
 client/cmd/status.go         |  2 +-
 client/netbird-entrypoint.sh | 30 ++++--------------------------
 4 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/client/Dockerfile b/client/Dockerfile
index 66a41882828..64d5ba04f09 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -17,8 +17,7 @@ ENV \
     NETBIRD_BIN="/usr/local/bin/netbird" \
     NB_LOG_FILE="console,/var/log/netbird/client.log" \
     NB_DAEMON_ADDR="unix:///var/run/netbird.sock" \
-    NB_ENTRYPOINT_SERVICE_TIMEOUT="30" \
-    NB_ENTRYPOINT_LOGIN_TIMEOUT="30"
+    NB_ENTRYPOINT_SERVICE_TIMEOUT="30"
 
 ENTRYPOINT [ "/usr/local/bin/netbird-entrypoint.sh" ]
 
diff --git a/client/Dockerfile-rootless b/client/Dockerfile-rootless
index b0d59fdf866..69d00aaf243 100644
--- a/client/Dockerfile-rootless
+++ b/client/Dockerfile-rootless
@@ -23,8 +23,7 @@ ENV \
     NB_DAEMON_ADDR="unix:///var/lib/netbird/netbird.sock" \
     NB_LOG_FILE="console,/var/lib/netbird/client.log" \
     NB_DISABLE_DNS="true" \
-    NB_ENTRYPOINT_SERVICE_TIMEOUT="30" \
-    NB_ENTRYPOINT_LOGIN_TIMEOUT="30"
+    NB_ENTRYPOINT_SERVICE_TIMEOUT="30"
 
 ENTRYPOINT [ "/usr/local/bin/netbird-entrypoint.sh" ]
 
diff --git a/client/cmd/status.go b/client/cmd/status.go
index 07dbf9101ab..c35a06eb3c6 100644
--- a/client/cmd/status.go
+++ b/client/cmd/status.go
@@ -218,7 +218,7 @@ func runHealthCheck(cmd *cobra.Command) error {
 	ctx := internal.CtxInitState(cmd.Context())
 
 	isStartup := check == "startup"
-	resp, err := getStatus(ctx, isStartup, isStartup)
+	resp, err := getStatus(ctx, isStartup, false)
 	if err != nil {
 		return err
 	}
diff --git a/client/netbird-entrypoint.sh b/client/netbird-entrypoint.sh
index f8267d6ee27..0e330bdacbb 100755
--- a/client/netbird-entrypoint.sh
+++ b/client/netbird-entrypoint.sh
@@ -2,7 +2,6 @@
 set -eEuo pipefail
 
 : ${NB_ENTRYPOINT_SERVICE_TIMEOUT:="30"}
-: ${NB_ENTRYPOINT_LOGIN_TIMEOUT:="30"}
 NETBIRD_BIN="${NETBIRD_BIN:-"netbird"}"
 export NB_LOG_FILE="${NB_LOG_FILE:-"console,/var/log/netbird/client.log"}"
 service_pids=()
@@ -51,31 +50,10 @@ wait_for_daemon_startup() {
   exit 1
 }
 
-login_if_needed() {
-  local timeout="${1}"
-
-  if "${NETBIRD_BIN}" status --check ready 2>/dev/null; then
-    info "already logged in, skipping 'netbird up'..."
-    return
-  fi
-
-  if [[ "${timeout}" -eq 0 ]]; then
-    info "logging in..."
-    "${NETBIRD_BIN}" up
-    return
-  fi
-
-  local deadline=$((SECONDS + timeout))
-  while [[ "${SECONDS}" -lt "${deadline}" ]]; do
-    if "${NETBIRD_BIN}" status --check ready 2>/dev/null; then
-      info "already logged in, skipping 'netbird up'..."
-      return
-    fi
-    sleep 1
-  done
-
-  info "logging in..."
+connect() {
+  info "running 'netbird up'..."
   "${NETBIRD_BIN}" up
+  return $?
 }
 
 main() {
@@ -85,7 +63,7 @@ main() {
   info "registered new service process 'netbird service run', currently running: ${service_pids[@]@Q}"
 
   wait_for_daemon_startup "${NB_ENTRYPOINT_SERVICE_TIMEOUT}"
-  login_if_needed "${NB_ENTRYPOINT_LOGIN_TIMEOUT}"
+  connect
 
   wait "${service_pids[@]}"
 }