summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-08-10 14:09:46 -0400
committerMatthew Heon <matthew.heon@gmail.com>2018-08-10 14:09:46 -0400
commit3d7e401d4e08698e94d3843e24491ef19ecc42c6 (patch)
treeb4f7c3f48d3ac5d3ba8c24cee24889bff5370e60
parent4b4fba0b4470d808d1cc48662eb6d09d31bc7955 (diff)
downloadpodman-3d7e401d4e08698e94d3843e24491ef19ecc42c6.tar.gz
podman-3d7e401d4e08698e94d3843e24491ef19ecc42c6.tar.bz2
podman-3d7e401d4e08698e94d3843e24491ef19ecc42c6.zip
Swap default CGroup manager to systemd
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
-rw-r--r--libpod.conf2
-rw-r--r--libpod/runtime.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod.conf b/libpod.conf
index 3a363e256..cef5a12d8 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -30,7 +30,7 @@ conmon_env_vars = [
]
# CGroup Manager - valid values are "systemd" and "cgroupfs"
-cgroup_manager = "cgroupfs"
+cgroup_manager = "systemd"
# Directory for persistent libpod files (database, etc)
# By default, this will be configured relative to where containers/storage
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 1a384fde2..0652b24f4 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -178,7 +178,7 @@ var (
ConmonEnvVars: []string{
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
},
- CgroupManager: CgroupfsCgroupsManager,
+ CgroupManager: SystemdCgroupsManager,
HooksDir: hooks.DefaultDir,
StaticDir: filepath.Join(storage.DefaultStoreOptions.GraphRoot, "libpod"),
TmpDir: "",