summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/run.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index ca66aadf2..32b3b9bdc 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -72,7 +72,13 @@ func runCmd(c *cli.Context) error {
options = append(options, libpod.WithUser(createConfig.User))
options = append(options, libpod.WithShmDir(createConfig.ShmDir))
options = append(options, libpod.WithShmSize(createConfig.Resources.ShmSize))
- options = append(options, libpod.WithCgroupParent(createConfig.CgroupParent))
+
+ // Default used if not overridden on command line
+
+ if createConfig.CgroupParent != "" {
+ options = append(options, libpod.WithCgroupParent(createConfig.CgroupParent))
+ }
+
ctr, err := runtime.NewContainer(runtimeSpec, options...)
if err != nil {
return err