summaryrefslogtreecommitdiff
path: root/cmd/podman/utils.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-17 21:04:33 +0100
committerGitHub <noreply@github.com>2019-02-17 21:04:33 +0100
commit6aaf8d39a9a26510e40fd54399e97fe177afadde (patch)
tree3754ecbf29b1d8e63675894f25abde206b8308c3 /cmd/podman/utils.go
parenta99f4924d9d76f59e85bde09944d7c5e687ea8aa (diff)
parent81804fc4641d279fec8f9bf48b21b22fc90cb891 (diff)
downloadpodman-6aaf8d39a9a26510e40fd54399e97fe177afadde.tar.gz
podman-6aaf8d39a9a26510e40fd54399e97fe177afadde.tar.bz2
podman-6aaf8d39a9a26510e40fd54399e97fe177afadde.zip
Merge pull request #2295 from haircommander/recursive-start
Recursively start a pod if a container is run in it
Diffstat (limited to 'cmd/podman/utils.go')
-rw-r--r--cmd/podman/utils.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go
index 744d010d5..c76e7f2a4 100644
--- a/cmd/podman/utils.go
+++ b/cmd/podman/utils.go
@@ -20,7 +20,7 @@ type RawTtyFormatter struct {
}
// Start (if required) and attach to a container
-func startAttachCtr(ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys string, sigProxy bool, startContainer bool) error {
+func startAttachCtr(ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys string, sigProxy bool, startContainer bool, recursive bool) error {
ctx := context.Background()
resize := make(chan remotecommand.TerminalSize)
@@ -76,7 +76,7 @@ func startAttachCtr(ctr *libpod.Container, stdout, stderr, stdin *os.File, detac
return ctr.Attach(streams, detachKeys, resize)
}
- attachChan, err := ctr.StartAndAttach(getContext(), streams, detachKeys, resize)
+ attachChan, err := ctr.StartAndAttach(getContext(), streams, detachKeys, resize, recursive)
if err != nil {
return err
}