diff options
author | Andrei Gherzan <andrei.gherzan@huawei.com> | 2022-08-24 02:07:19 +0200 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-08-23 21:44:32 -0400 |
commit | d55da717eb615a7a964a1c120c543bec4f9bea56 (patch) | |
tree | ba13feeaca504f19c8c651ac35c837f6126a2b8c | |
parent | 46f90043656ade78ea1b8a23506aaa27f9fa8b39 (diff) | |
download | meta-virtualization-d55da717eb615a7a964a1c120c543bec4f9bea56.tar.gz |
podman: Rename podman-rootless.conf sysctl file to aid overrides
Files are sorted in lexicographic order. Moving podman-rootless.conf to
something greater then '00' would help with systems providing default
values in other configuration files that can be overridden by
podman-rootless.conf.
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-containers/podman/podman/50-podman-rootless.conf (renamed from recipes-containers/podman/podman/00-podman-rootless.conf) | 0 | ||||
-rw-r--r-- | recipes-containers/podman/podman_git.bb | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-containers/podman/podman/00-podman-rootless.conf b/recipes-containers/podman/podman/50-podman-rootless.conf index aaede0e1..aaede0e1 100644 --- a/recipes-containers/podman/podman/00-podman-rootless.conf +++ b/recipes-containers/podman/podman/50-podman-rootless.conf | |||
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb index 9b92094c..e9991920 100644 --- a/recipes-containers/podman/podman_git.bb +++ b/recipes-containers/podman/podman_git.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = " \ | |||
22 | git://github.com/containers/libpod.git;branch=v4.1;protocol=https \ | 22 | git://github.com/containers/libpod.git;branch=v4.1;protocol=https \ |
23 | file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \ | 23 | file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \ |
24 | file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \ | 24 | file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \ |
25 | ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://00-podman-rootless.conf', '', d)} \ | 25 | ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \ |
26 | " | 26 | " |
27 | 27 | ||
28 | LICENSE = "Apache-2.0" | 28 | LICENSE = "Apache-2.0" |
@@ -105,7 +105,7 @@ do_install() { | |||
105 | 105 | ||
106 | if ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'true', 'false', d)}; then | 106 | if ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'true', 'false', d)}; then |
107 | install -d "${D}${sysconfdir}/sysctl.d" | 107 | install -d "${D}${sysconfdir}/sysctl.d" |
108 | install -m 0644 "${WORKDIR}/00-podman-rootless.conf" "${D}${sysconfdir}/sysctl.d" | 108 | install -m 0644 "${WORKDIR}/50-podman-rootless.conf" "${D}${sysconfdir}/sysctl.d" |
109 | fi | 109 | fi |
110 | } | 110 | } |
111 | 111 | ||