From 4695ce02620407a5074125eaa5b257dd0e73758a Mon Sep 17 00:00:00 2001
From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Wed, 17 Oct 2018 16:41:58 +0200
Subject: Rework last changes about LD_LIBRARY_PATH issue

Last fix that just add unset LD_LIBRARY_PATH in xds-project.conf file was
not good enough.
Fix problem in xds-server (see
https://gerrit.automotivelinux.org/gerrit/#/c/17253/)
and this commit just add propagation of new LdLibPathNoReset field
in xds-agent.

Change-Id: I8312e7d37a54ea6532b8988ca1c825b5d7d51c5d
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
---
 lib/agent/apiv1-exec.go | 23 ++++++++++++-----------
 lib/agent/projects.go   |  2 --
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'lib/agent')

diff --git a/lib/agent/apiv1-exec.go b/lib/agent/apiv1-exec.go
index 4a1340b..d742693 100644
--- a/lib/agent/apiv1-exec.go
+++ b/lib/agent/apiv1-exec.go
@@ -181,17 +181,18 @@ func (s *APIService) execCmd(c *gin.Context) {
 	// Forward back command to right server
 	res := xsapiv1.ExecResult{}
 	xsArgs := &xsapiv1.ExecArgs{
-		ID:              args.ID,
-		SdkID:           args.SdkID,
-		CmdID:           args.CmdID,
-		Cmd:             args.Cmd,
-		Args:            args.Args,
-		Env:             args.Env,
-		RPath:           args.RPath,
-		TTY:             args.TTY,
-		TTYGdbserverFix: args.TTYGdbserverFix,
-		ExitImmediate:   args.ExitImmediate,
-		CmdTimeout:      args.CmdTimeout,
+		ID:               args.ID,
+		SdkID:            args.SdkID,
+		CmdID:            args.CmdID,
+		Cmd:              args.Cmd,
+		Args:             args.Args,
+		Env:              args.Env,
+		RPath:            args.RPath,
+		TTY:              args.TTY,
+		TTYGdbserverFix:  args.TTYGdbserverFix,
+		LdLibPathNoReset: args.LdLibPathNoReset,
+		ExitImmediate:    args.ExitImmediate,
+		CmdTimeout:       args.CmdTimeout,
 	}
 	if err := svr.CommandExec(xsArgs, &res); err != nil {
 		common.APIError(c, err.Error())
diff --git a/lib/agent/projects.go b/lib/agent/projects.go
index d5f809f..0bd5315 100644
--- a/lib/agent/projects.go
+++ b/lib/agent/projects.go
@@ -169,8 +169,6 @@ func (p *Projects) Add(newP xaapiv1.ProjectConfig, fromSid, requestURL string) (
 		} else {
 			fd.WriteString("#export XDS_SDK_ID=???\n")
 		}
-		fd.WriteString("\n# Only disable reset of LD_LIBRARY_PATH if you are absolutely know what you are doing!\n")
-		fd.WriteString("export LD_LIBRARY_PATH=''\n")
 		fd.Close()
 	}
 
-- 
cgit 1.2.3-korg