aboutsummaryrefslogtreecommitdiffstats
path: root/testing/podman/libpod-config.patch
blob: 784241f450306dd72841ebb3a3f72a467ff7604b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
diff --git a/libpod.conf b/libpod.conf
index 1bc31eb4c..278551726 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -24,10 +24,10 @@ conmon_env_vars = [
 ]
 
 # CGroup Manager - valid values are "systemd" and "cgroupfs"
-cgroup_manager = "systemd"
+cgroup_manager = "cgroupfs"
 
 # Container init binary
-#init_path = "/usr/libexec/podman/catatonit"
+#init_path = "/usr/bin/catatonit"
 
 # Directory for persistent libpod files (database, etc)
 # By default, this will be configured relative to where containers/storage
@@ -50,6 +50,7 @@ cni_config_dir = "/etc/cni/net.d/"
 
 # Directories where the CNI plugin binaries may be located
 cni_plugin_dir = [
+	       "/usr/share/cni-plugins/bin",
 	       "/usr/libexec/cni",
 	       "/usr/lib/cni",
 	       "/usr/local/lib/cni",
@@ -116,7 +117,7 @@ num_locks = 2048
 # detach_keys = "ctrl-p,ctrl-q"
 
 # Default OCI runtime
-runtime = "runc"
+runtime = "crun"
 
 # List of the OCI runtimes that support --format=json.  When json is supported
 # libpod will use it for reporting nicer errors.