summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-04-23 09:25:15 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-04-23 09:27:58 -0400
commitf44f830e9f3ac40b1aa28d4bd64eeebf3aca6237 (patch)
tree2639c3c528e714ab3607153083d7570cea894175 /libpod
parent6f28c92865c4ac262bce790ecda2a07d1127760f (diff)
downloadpodman-f44f830e9f3ac40b1aa28d4bd64eeebf3aca6237.tar.gz
podman-f44f830e9f3ac40b1aa28d4bd64eeebf3aca6237.tar.bz2
podman-f44f830e9f3ac40b1aa28d4bd64eeebf3aca6237.zip
Don't check configuration until user input is applied
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime.go3
1 files changed, 2 insertions, 1 deletions
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