summaryrefslogtreecommitdiff
path: root/cmd/podman/main_local.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-06 12:50:47 +0100
committerGitHub <noreply@github.com>2019-11-06 12:50:47 +0100
commitcee2c1b0481917152ed04c5f18e836596cdcf5a5 (patch)
tree5c2e2df192f16062e78d694fc7977b8ecf955f0e /cmd/podman/main_local.go
parentb4b727256c728295e6a3fcb69593347df9e90b23 (diff)
parenteb9235fc639e4cd44d7bdbf0a97e2f1ed00ee4ce (diff)
downloadpodman-cee2c1b0481917152ed04c5f18e836596cdcf5a5.tar.gz
podman-cee2c1b0481917152ed04c5f18e836596cdcf5a5.tar.bz2
podman-cee2c1b0481917152ed04c5f18e836596cdcf5a5.zip
Merge pull request #4457 from vrothberg/fix-4456
help message: don't parse the config for cgroup-manager default
Diffstat (limited to 'cmd/podman/main_local.go')
-rw-r--r--cmd/podman/main_local.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/cmd/podman/main_local.go b/cmd/podman/main_local.go
index 6057eeec3..f630f1210 100644
--- a/cmd/podman/main_local.go
+++ b/cmd/podman/main_local.go
@@ -16,7 +16,6 @@ import (
"github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/cmd/podman/libpodruntime"
- "github.com/containers/libpod/libpod/config"
"github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/cgroups"
"github.com/containers/libpod/pkg/rootless"
@@ -34,9 +33,6 @@ const remote = false
func init() {
cgroupManager := define.SystemdCgroupsManager
- if runtimeConfig, err := config.NewConfig(""); err == nil {
- cgroupManager = runtimeConfig.CgroupManager
- }
cgroupHelp := "Cgroup manager to use (cgroupfs or systemd)"
cgroupv2, _ := cgroups.IsCgroup2UnifiedMode()
if rootless.IsRootless() && !cgroupv2 {