- podman: remove anonymous volumes

Resolves: rhbz#2029753
This commit is contained in:
Oyvind Albrigtsen 2022-01-05 10:25:07 +01:00
parent 30e1b52b48
commit a77d15ba3a
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,22 @@
From c6338011cf9ea69324f44c8c31a4ca2478aab35a Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Tue, 7 Dec 2021 08:59:50 +0100
Subject: [PATCH] podman: remove anonymous volumes
---
heartbeat/podman | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/heartbeat/podman b/heartbeat/podman
index fd901c968..2b73857f1 100755
--- a/heartbeat/podman
+++ b/heartbeat/podman
@@ -251,7 +251,7 @@ remove_container()
return 0
fi
ocf_log notice "Cleaning up inactive container, ${CONTAINER}."
- ocf_run podman rm $CONTAINER
+ ocf_run podman rm -v $CONTAINER
rc=$?
if [ $rc -ne 0 ]; then
# due to a podman bug (rhbz#1841485), sometimes a stopped

View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.10.0
Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
@ -55,6 +55,7 @@ Patch2: bz2021125-gcp-ilb-1-fix-log_enable.patch
Patch3: bz2021125-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch
Patch4: bz2029796-Route-return-OCF_NOT_RUNNING-missing-route.patch
Patch5: bz2029704-db2-crm_attribute-use-forever.patch
Patch6: bz2029753-podman-remove-anonymous-volumes.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aws.patch
@ -184,6 +185,7 @@ exit 1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
# bundled ha-cloud-support libs
%patch500 -p1
@ -513,6 +515,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Wed Jan 5 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-5
- podman: remove anonymous volumes
Resolves: rhbz#2029753
* Tue Dec 7 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-4
- Route: return OCF_NOT_RUNNING for probe action when interface
or route doesnt exist