diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-27 15:20:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 15:20:50 +0200 |
| commit | ca15a83fe0db5e5af917149d7b7cb770474edab1 (patch) | |
| tree | 529e4262203d7162fee90b7653cec8b160fcb64a | |
| parent | e4b4eaae10d62a3043ac0120123a57bd2c14763e (diff) | |
| parent | f44f830e9f3ac40b1aa28d4bd64eeebf3aca6237 (diff) | |
| download | podman-ca15a83fe0db5e5af917149d7b7cb770474edab1.tar.gz podman-ca15a83fe0db5e5af917149d7b7cb770474edab1.tar.bz2 podman-ca15a83fe0db5e5af917149d7b7cb770474edab1.zip | |
Merge pull request #5953 from rhatdan/v1.9
Don't check configuration until user input is applied
| -rw-r--r-- | cmd/podman/cliconfig/config.go | 1 | ||||
| -rw-r--r-- | cmd/podman/main.go | 3 | ||||
| -rw-r--r-- | libpod/runtime.go | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go index 6d98aaf0e..0ae10e337 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 4435b036e..75318db60 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 a6032ad23..d5e2c51d8 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 |