From e1c66a8124b40aa5963c3e3c3169d424df548404 Mon Sep 17 00:00:00 2001
From: hakansa <43675540+hakansa@users.noreply.github.com>
Date: Mon, 28 Jul 2025 13:36:48 +0300
Subject: [PATCH] [client] Fix profile directory path handling based on
 NB_STATE_DIR (#4229)

[client] Fix profile directory path handling based on NB_STATE_DIR (#4229)
---
 client/internal/profilemanager/service.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/client/internal/profilemanager/service.go b/client/internal/profilemanager/service.go
index 56198c4cc..520eef2e9 100644
--- a/client/internal/profilemanager/service.go
+++ b/client/internal/profilemanager/service.go
@@ -34,14 +34,18 @@ func init() {
 	DefaultConfigPathDir = "/var/lib/netbird/"
 	oldDefaultConfigPathDir = "/etc/netbird/"
 
-	switch runtime.GOOS {
-	case "windows":
-		oldDefaultConfigPathDir = filepath.Join(os.Getenv("PROGRAMDATA"), "Netbird")
-		DefaultConfigPathDir = oldDefaultConfigPathDir
+	if stateDir := os.Getenv("NB_STATE_DIR"); stateDir != "" {
+		DefaultConfigPathDir = stateDir
+	} else {
+		switch runtime.GOOS {
+		case "windows":
+			oldDefaultConfigPathDir = filepath.Join(os.Getenv("PROGRAMDATA"), "Netbird")
+			DefaultConfigPathDir = oldDefaultConfigPathDir
 
-	case "freebsd":
-		oldDefaultConfigPathDir = "/var/db/netbird/"
-		DefaultConfigPathDir = oldDefaultConfigPathDir
+		case "freebsd":
+			oldDefaultConfigPathDir = "/var/db/netbird/"
+			DefaultConfigPathDir = oldDefaultConfigPathDir
+		}
 	}
 
 	oldDefaultConfigPath = filepath.Join(oldDefaultConfigPathDir, "config.json")