[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/files/

[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/files/

[Zac Medico]

commit:     b665394890be93ab9cc52d77d36c9191e98ee078
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Mon Apr  1 03:25:14 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 05:57:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6653948

app-containers/podman: cleanup unused files

Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/36031
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-containers/podman/files/podman.confd | 11 -----------
 app-containers/podman/files/podman.initd | 20 --------------------
 2 files changed, 31 deletions(-)

diff --git a/app-containers/podman/files/podman.confd b/app-containers/podman/files/podman.confd
deleted file mode 100644
index e997d3b4000e..000000000000
--- a/app-containers/podman/files/podman.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for /etc/init.d/podman
-
-# Sets the API service daemon log level
-# valid levels: debug, info, warn, error, fatal or panic
-#LOG_LEVEL="error"
-
-# Sets the API service daemon socket
-#SOCKET="unix:/run/${RC_SVCNAME}/podman.sock"
-
-# Configure the user[:group] the API service daemon will run as
-#RUN_AS_USER="root:root"

diff --git a/app-containers/podman/files/podman.initd b/app-containers/podman/files/podman.initd
deleted file mode 100644
index 7adcdab40ea3..000000000000
--- a/app-containers/podman/files/podman.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Podman Remote API Service"
-LOG_PATH="/var/log/${RC_SVCNAME}"
-RUN_PATH="/run/${RC_SVCNAME}"
-: ${LOG_LEVEL:=error}
-: ${RUN_AS_USER:=root:root}
-: ${SOCKET:=unix:/run/${RC_SVCNAME}/podman.sock}
-pidfile="${RUN_PATH}/${RC_SVCNAME}.pid"
-command="/usr/bin/podman"
-command_args="--log-level ${LOG_LEVEL} system service -t 0 ${SOCKET}"
-command_background="true"
-start_stop_daemon_args="--stdout ${LOG_PATH}/${RC_SVCNAME}.log --stderr ${LOG_PATH}/${RC_SVCNAME}.log --user ${RUN_AS_USER}"
-
-start() {
-	checkpath -o "${RUN_AS_USER}" -d "${RUN_PATH}" "${LOG_PATH}"
-	default_start
-}

[gentoo-commits] repo/gentoo:master commit in: app-containers/podman/files/

[Zac Medico]

commit:     32737b5387c1c33f9a4c38f08995ebed85472393
Author:     NN708 <nn708 <AT> Mac <DOT> lan>
AuthorDate: Sun Feb  9 04:04:19 2025 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 17:55:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32737b53

app-containers/podman: fix restart behavior of unless-stopped

Signed-off-by: NN708 <nn708 <AT> outlook.com>
Closes: https://github.com/gentoo/gentoo/pull/40494
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-containers/podman/files/podman-restart-5.0.0_rc4.initd | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-containers/podman/files/podman-restart-5.0.0_rc4.initd b/app-containers/podman/files/podman-restart-5.0.0_rc4.initd
index d02bd64c6279..62bea5bc12de 100644
--- a/app-containers/podman/files/podman-restart-5.0.0_rc4.initd
+++ b/app-containers/podman/files/podman-restart-5.0.0_rc4.initd
@@ -2,21 +2,21 @@
 # Copyright 2015-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-description="Start all containers with restart-policy set to always"
+description="Start all containers with restart-policy set to always or unless-stopped"
 
 command_user="${RUN_AS_USER:=root:root}"
 command="/usr/bin/podman"
-command_args="--log-level ${LOG_LEVEL:=info} start --all --filter restart-policy=always"
+command_args="--log-level ${LOG_LEVEL:=info} start --all --filter restart-policy=always --filter restart-policy=unless-stopped"
 
 depend() {
 	after net
 }
 
 stop() {
-	ebegin "Stopping all containers with restart-policy set to always"
+	ebegin "Stopping all containers with restart-policy set to always or unless-stopped"
 	${command} \
 		--log-level ${LOG_LEVEL} \
 		stop \
-		$(${command} container ls --filter restart-policy=always -q)
-	eend $? "Failed to stop containers with restart-policy set to always"
+		$(${command} container ls --filter restart-policy=always --filter restart-policy=unless-stopped -q)
+	eend $? "Failed to stop containers with restart-policy set to always or unless-stopped"
 }