diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-09 10:23:03 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-09 10:23:03 -0700 |
commit | f61e399a66c716cc6b18659e6b21208007d48848 (patch) | |
tree | e06d20367e6d827d6959cbfba8abbdb4d108b82f /cmd/podman | |
parent | c3c40f970e6441b70ac62fb050a35f79fedb8896 (diff) | |
parent | 8b5f165fc1ec7bef15a0102544321b8d8c730347 (diff) | |
download | podman-f61e399a66c716cc6b18659e6b21208007d48848.tar.gz podman-f61e399a66c716cc6b18659e6b21208007d48848.tar.bz2 podman-f61e399a66c716cc6b18659e6b21208007d48848.zip |
Merge pull request #4200 from mheon/fix_sigproxy_start
Respect --sig-proxy flag with podman start --attach
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/start.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/start.go b/cmd/podman/start.go index 737a6d9f1..2d2cf74d2 100644 --- a/cmd/podman/start.go +++ b/cmd/podman/start.go @@ -60,6 +60,9 @@ func startCmd(c *cliconfig.StartValues) error { } sigProxy := c.SigProxy || attach + if c.Flag("sig-proxy").Changed { + sigProxy = c.SigProxy + } if sigProxy && !attach { return errors.Wrapf(define.ErrInvalidArg, "you cannot use sig-proxy without --attach") |