diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go index 6d98aaf0ec..0ae10e3374 100644 --- a/cmd/podman/cliconfig/config.go +++ b/cmd/podman/cliconfig/config.go @@ -708,7 +708,6 @@ type UntagValues struct { func GetDefaultConfig() *config.Config { var err error conf, err := config.NewConfig("") - conf.CheckCgroupsAndAdjustConfig() if err != nil { logrus.Errorf("Error loading container config %v\n", err) os.Exit(1) diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 4435b036e2..75318db608 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -126,6 +126,9 @@ func before(cmd *cobra.Command, args []string) error { return err } + defaultContainerConfig.Engine.CgroupManager = MainGlobalOpts.CGroupManager + defaultContainerConfig.CheckCgroupsAndAdjustConfig() + if err := setupRootless(cmd, args); err != nil { return err } diff --git a/libpod/runtime.go b/libpod/runtime.go index a6032ad23c..d5e2c51d80 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -131,8 +131,9 @@ func NewRuntime(ctx context.Context, options ...RuntimeOption) (runtime *Runtime if err != nil { return nil, err } + runtime, err = newRuntimeFromConfig(ctx, conf, options...) conf.CheckCgroupsAndAdjustConfig() - return newRuntimeFromConfig(ctx, conf, options...) + return runtime, err } // NewRuntimeFromConfig creates a new container runtime using the given