summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2019-11-06 08:52:10 +0100
committerValentin Rothberg <rothberg@redhat.com>2019-11-06 09:00:12 +0100
commiteb9235fc639e4cd44d7bdbf0a97e2f1ed00ee4ce (patch)
tree5c2e2df192f16062e78d694fc7977b8ecf955f0e /cmd
parentb4b727256c728295e6a3fcb69593347df9e90b23 (diff)
downloadpodman-eb9235fc639e4cd44d7bdbf0a97e2f1ed00ee4ce.tar.gz
podman-eb9235fc639e4cd44d7bdbf0a97e2f1ed00ee4ce.tar.bz2
podman-eb9235fc639e4cd44d7bdbf0a97e2f1ed00ee4ce.zip
help message: don't parse the config for cgroup-manager default
Do not generate an entire `config.Config` for displaying the default value for the --cgroup-manager flag and just default to systemd. Not using the `config.Config` is okay as 1) the value may change at runtime in any case (rootless, DBUS access, etc.), 2) it avoids to redundantly parse the system config files and to generate the hard-coded default config, and 3) the log-level and other attributes are not yet set during init() causing undesirable side effects. Fixes: #4456 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'cmd')
-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 {