diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-10-17 17:05:47 +0200 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-10-17 17:05:49 +0200 |
| commit | ea6d35c3b735d019982cd077171b464b37c5cb77 (patch) | |
| tree | cd7570f9c1b476acceaf68da4d304777c02d64f1 | |
| parent | 5e7b2dec616b844dd881897727d0edceb90dfa85 (diff) | |
Add hidden option -ldlibpath-no-reset
Following change (https://gerrit.automotivelinux.org/gerrit/#/c/17253/)
xds-server unset LD_LIBRARY_PATH by default.
This new option allows user to keep LD_LIBRARY_PATH as is (IOW don't uset
LD_LIBRARY_PATH) before executing the requested commands.
Note that this option is hidden (not listed in help output) because it's
only reserved for advanced usage.
Change-Id: I34928763699bc24e726f5cb7de0877c0b2bfb813
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
| -rw-r--r-- | cmd-exec.go | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/cmd-exec.go b/cmd-exec.go index 819b911..98ceb78 100644 --- a/cmd-exec.go +++ b/cmd-exec.go @@ -48,6 +48,12 @@ func initCmdExec(cmdDef *[]cli.Command) { EnvVar: "XDS_SDK_ID", Usage: "Cross Sdk ID to use to build project", }, + cli.BoolFlag{ + Name: "ldlibpath-no-reset", + Hidden: true, + EnvVar: "XDS_LD_LIBRARY_PATH_NO_RESET", + Usage: "Don't reset LD_LIBRARY_PATH before executing command", + }, }, }) } @@ -144,13 +150,14 @@ func execCmd(ctx *cli.Context) error { // Send build command args := xaapiv1.ExecArgs{ - ID: prjID, - SdkID: sdkid, - Cmd: strings.Trim(argsCommand[0], " "), - Args: argsCommand[1:], - Env: env, - RPath: rPath, - CmdTimeout: 60, + ID: prjID, + SdkID: sdkid, + Cmd: strings.Trim(argsCommand[0], " "), + Args: argsCommand[1:], + Env: env, + RPath: rPath, + LdLibPathNoReset: ctx.Bool("ldlibpath-no-reset"), + CmdTimeout: 60, } LogPost("POST /exec %v", args) |