summaryrefslogtreecommitdiffstats
path: root/lib/agent
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2018-10-17 16:41:58 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2018-10-17 16:43:04 +0200
commit4695ce02620407a5074125eaa5b257dd0e73758a (patch)
treedb5e3b1eadc856f59c930cc8967878da059739c8 /lib/agent
parentc2558601c7ce2b7fd7eaf7c2336fb78242781e50 (diff)
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>
Diffstat (limited to 'lib/agent')
-rw-r--r--lib/agent/apiv1-exec.go23
-rw-r--r--lib/agent/projects.go2
2 files changed, 12 insertions, 13 deletions
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()
}