[arch-commits] Commit in podman/trunk (3 files)
David Runge
dvzrv at gemini.archlinux.org
Wed Aug 3 20:57:46 UTC 2022
Date: Wednesday, August 3, 2022 @ 20:57:46
Author: dvzrv
Revision: 1260156
upgpkg: podman 4.1.1-4: Rebuild to fix issue with default init_path (path to catatonit).
The previous patch just set the default path in a containers.conf that is never installed and therefore did nothing.
This patch sets the default init_path to /usr/lib/podman/catatonit in the vendored containers/common source code instead.
Added:
podman/trunk/podman-4.1.1-defaultinitpath.patch
Modified:
podman/trunk/PKGBUILD
Deleted:
podman/trunk/podman-4.1.1-libexec.patch
------------------------------------+
PKGBUILD | 10 +++++-----
podman-4.1.1-defaultinitpath.patch | 13 +++++++++++++
podman-4.1.1-libexec.patch | 13 -------------
3 files changed, 18 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-03 20:23:05 UTC (rev 1260155)
+++ PKGBUILD 2022-08-03 20:57:46 UTC (rev 1260156)
@@ -6,7 +6,7 @@
pkgname=(podman podman-docker)
pkgver=4.1.1
_commit=2ab593258b45c8071f8407ef2403227503fc4534 # refs/tags/v4.1.1
-pkgrel=3
+pkgrel=4
pkgdesc='Tool and library for running OCI-based containers in pods'
arch=(x86_64)
url='https://github.com/containers/podman'
@@ -16,13 +16,13 @@
options=(!lto)
source=(
git+$url#tag=$_commit?signed
- $pkgname-4.1.1-libexec.patch
+ $pkgname-4.1.1-defaultinitpath.patch
)
validpgpkeys=(
'B7DBDCA456F7335E91F1C25CD3624C551D0515C4' # Matthew Heon <mheon at redhat.com>
)
sha256sums=('SKIP'
- '42a4475ffad503193d9dfc2637ecfa585b595f6a132c4b80932ae74d8c975596')
+ '58c830aea7fc11abd69170f7e305763e16d8bad69f49632601dc1544d47fdbc0')
pkgver() {
cd $pkgname
@@ -30,9 +30,9 @@
}
prepare() {
- # uncomment init_path in containers.conf as it defaults to using /usr/libexec/podman otherwise:
+ # set default init_path to /usr/lib/podman/catatonit
# https://bugs.archlinux.org/task/75493
- patch -Np1 -d $pkgname -i ../$pkgname-4.1.1-libexec.patch
+ patch -Np1 -d $pkgname -i ../$pkgname-4.1.1-defaultinitpath.patch
}
build() {
Added: podman-4.1.1-defaultinitpath.patch
===================================================================
--- podman-4.1.1-defaultinitpath.patch (rev 0)
+++ podman-4.1.1-defaultinitpath.patch 2022-08-03 20:57:46 UTC (rev 1260156)
@@ -0,0 +1,13 @@
+diff --git i/vendor/github.com/containers/common/pkg/config/default.go w/vendor/github.com/containers/common/pkg/config/default.go
+index 8979a406b..4736e0188 100644
+--- i/vendor/github.com/containers/common/pkg/config/default.go
++++ w/vendor/github.com/containers/common/pkg/config/default.go
+@@ -47,7 +47,7 @@ const (
+
+ var (
+ // DefaultInitPath is the default path to the container-init binary
+- DefaultInitPath = "/usr/libexec/podman/catatonit"
++ DefaultInitPath = "/usr/lib/podman/catatonit"
+ // DefaultInfraImage to use for infra container
+ DefaultInfraImage = ""
+ // DefaultRootlessSHMLockPath is the default path for rootless SHM locks
Deleted: podman-4.1.1-libexec.patch
===================================================================
--- podman-4.1.1-libexec.patch 2022-08-03 20:23:05 UTC (rev 1260155)
+++ podman-4.1.1-libexec.patch 2022-08-03 20:57:46 UTC (rev 1260156)
@@ -1,13 +0,0 @@
-diff --git i/vendor/github.com/containers/common/pkg/config/containers.conf w/vendor/github.com/containers/common/pkg/config/containers.conf
-index a4e755a66..27b625f82 100644
---- i/vendor/github.com/containers/common/pkg/config/containers.conf
-+++ w/vendor/github.com/containers/common/pkg/config/containers.conf
-@@ -146,7 +146,7 @@ default_sysctls = [
-
- # Container init binary, if init=true, this is the init binary to be used for containers.
- #
--#init_path = "/usr/libexec/podman/catatonit"
-+init_path = "/usr/lib/podman/catatonit"
-
- # Default way to to create an IPC namespace (POSIX SysV IPC) for the container
- # Options are:
More information about the arch-commits
mailing list