diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-11 13:06:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 13:06:39 -0700 |
| commit | 272f10f1bbf885c15b7a02175804020d71a5f992 (patch) | |
| tree | d5920429a440d86231a27c58c905e1cefb75a97c /cmd/podman/shared/intermediate.go | |
| parent | 745993b592903544e5a3b38ae9336e65c56874f4 (diff) | |
| parent | 495f2ce5150bc8ab042a24967a08da22a2465b3b (diff) | |
| download | podman-272f10f1bbf885c15b7a02175804020d71a5f992.tar.gz podman-272f10f1bbf885c15b7a02175804020d71a5f992.tar.bz2 podman-272f10f1bbf885c15b7a02175804020d71a5f992.zip | |
Merge pull request #2902 from baude/remoteattachfixes
Fixes for podman-remote run and attach
Diffstat (limited to 'cmd/podman/shared/intermediate.go')
| -rw-r--r-- | cmd/podman/shared/intermediate.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go index 9afbd68c8..2e1827561 100644 --- a/cmd/podman/shared/intermediate.go +++ b/cmd/podman/shared/intermediate.go @@ -360,7 +360,7 @@ func newCRStringArray(c *cliconfig.PodmanCommand, flag string) CRStringArray { } // NewIntermediateLayer creates a GenericCLIResults from a create or run cli-command -func NewIntermediateLayer(c *cliconfig.PodmanCommand) GenericCLIResults { +func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIResults { m := make(map[string]GenericCLIResult) m["add-host"] = newCRStringSlice(c, "add-host") @@ -458,8 +458,10 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand) GenericCLIResults { m["volumes-from"] = newCRStringSlice(c, "volumes-from") m["workdir"] = newCRString(c, "workdir") // global flag - m["trace"] = newCRBool(c, "trace") - m["syslog"] = newCRBool(c, "syslog") + if !remote { + m["trace"] = newCRBool(c, "trace") + m["syslog"] = newCRBool(c, "syslog") + } return GenericCLIResults{m, c.InputArgs} } |