diff options
| author | Michał Polański <michal@polanski.me> | 2020-01-19 21:57:17 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-01-19 23:49:46 +0100 |
| commit | ba2ae2f48b61628c04e4976df7522cdf7b8b3620 (patch) | |
| tree | e3039eeaddf5f87bc4f9890b9f4d52ba4e454621 /testing/podman/libpod-config.patch | |
| parent | 05c5c08f4907f4ff30734eef4141a9daeb675205 (diff) | |
| download | aports-ba2ae2f48b61628c04e4976df7522cdf7b8b3620.tar.bz2 aports-ba2ae2f48b61628c04e4976df7522cdf7b8b3620.tar.xz | |
testing/podman: install configuration files
- add conmon and cni-plugins to dependencies
- install default CNI network
- patch libpod.conf
Diffstat (limited to 'testing/podman/libpod-config.patch')
| -rw-r--r-- | testing/podman/libpod-config.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/testing/podman/libpod-config.patch b/testing/podman/libpod-config.patch new file mode 100644 index 0000000000..5d41a73128 --- /dev/null +++ b/testing/podman/libpod-config.patch @@ -0,0 +1,26 @@ +diff --git a/libpod.conf b/libpod.conf +index 7e0228c1..c767b80d 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", + |