X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsconfig%2Ffileconfig.go;h=d936bbe205df7eda5dd6e34a9bbc7bde316df9ae;hb=7843cfd903cf7770df81c91193068900fb563e59;hp=2358a31dd2ab347056dfd16325e9adfc404553e8;hpb=1c6af6236743aa0963d4919b5ef42627efa6aca7;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index 2358a31..d936bbe 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"os/user"
 	"path"
-	"path/filepath"
 
 	common "github.com/iotbzh/xds-common/golib"
 )
@@ -28,8 +27,7 @@ type FileConfig struct {
 // Order to determine which config file is used:
 //  1/ from command line option: "--config myConfig.json"
 //  2/ $HOME/.xds/agent/agent-config.json file
-//  3/ <current_dir>/agent-config.json file
-//  4/ <executable dir>/agent-config.json file
+//  3/ /etc/xds-agent/config.json file
 
 func updateConfigFromFile(c *Config, confFile string) (*FileConfig, error) {
 
@@ -40,14 +38,8 @@ func updateConfigFromFile(c *Config, confFile string) (*FileConfig, error) {
 	if usr, err := user.Current(); err == nil {
 		searchIn = append(searchIn, path.Join(usr.HomeDir, ".xds", "agent", "agent-config.json"))
 	}
-	cwd, err := os.Getwd()
-	if err == nil {
-		searchIn = append(searchIn, path.Join(cwd, "agent-config.json"))
-	}
-	exePath, err := filepath.Abs(filepath.Dir(os.Args[0]))
-	if err == nil {
-		searchIn = append(searchIn, path.Join(exePath, "agent-config.json"))
-	}
+
+	searchIn = append(searchIn, "/etc/xds-agent/config.json")
 
 	var cFile *string
 	for _, p := range searchIn {