summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2020-07-10 11:37:30 -0400
committerMatthew Heon <matthew.heon@pm.me>2020-07-22 14:34:20 -0400
commit0030dd3f75aa2f5877fa599a325f19b9e4140209 (patch)
treeb5de0dffc7aadc74e5e41cbe34166347a010dfd9
parent24f0175d90b78504e49882b11d72b96a79e58a3b (diff)
downloadpodman-0030dd3f75aa2f5877fa599a325f19b9e4140209.tar.gz
podman-0030dd3f75aa2f5877fa599a325f19b9e4140209.tar.bz2
podman-0030dd3f75aa2f5877fa599a325f19b9e4140209.zip
Ensure sig-proxy default is propagated in start
We properly determined what sig-proxy should be set to, but we never passed that along to the backend. As such, cases where the default swapped (mostly when `--attach` was specified but the `--sig-proxy` flag was not) were not handled correctly Fixes #6928 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
-rw-r--r--cmd/podman/containers/start.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go
index 941588137..21f22b986 100644
--- a/cmd/podman/containers/start.go
+++ b/cmd/podman/containers/start.go
@@ -82,6 +82,7 @@ func start(cmd *cobra.Command, args []string) error {
if cmd.Flag("sig-proxy").Changed {
sigProxy = startOptions.SigProxy
}
+ startOptions.SigProxy = sigProxy
if sigProxy && !startOptions.Attach {
return errors.Wrapf(define.ErrInvalidArg, "you cannot use sig-proxy without --attach")