Merge pull request containers#4457 from vrothberg/fix-4456

help message: don't parse the config for cgroup-manager default
mheon · Nov 6, 2019 · cee2c1b · cee2c1b
2 parents b4b7272 + eb9235f
commit cee2c1b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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 {