Make Salt Bundle more tolerant to long running jobs (bsc#1228690)

salt/enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch

@@ -0,0 +1,26 @@
+From 994ebca519945c86dc30f1510dff36b3261446c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
+ <[email protected]>
+Date: Thu, 10 Oct 2024 11:51:02 +0100
+Subject: [PATCH] Enhance cleanup mechanism after Salt Bundle upgrade
+ (bsc#1228690) (#685)
+
+---
+ pkg/common/venv-salt-minion-postinstall.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg/common/venv-salt-minion-postinstall.service b/pkg/common/venv-salt-minion-postinstall.service
+index b122d7d6ea..c9db270435 100644
+--- a/pkg/common/venv-salt-minion-postinstall.service
++++ b/pkg/common/venv-salt-minion-postinstall.service
+@@ -2,6 +2,6 @@
+ Description=Clean old environment for venv-salt-minion
+
+ [Service]
+-ExecStart=/bin/sh -c '/usr/lib/venv-salt-minion/bin/post_start_cleanup.sh || :'
++ExecStart=/bin/sh -c 'WAIT_IF_SALT_JOBS=1 /usr/lib/venv-salt-minion/bin/post_start_cleanup.sh || :'
+ Type=oneshot
+
+-- 
+2.46.1
+

salt/salt.spec

@@ -450,6 +450,8 @@ Patch142:       avoid-explicit-reading-of-etc-salt-minion-bsc-122035.patch
 Patch143:       fix-x509-test-fails-on-old-openssl-systems-682.patch
 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/684
 Patch144:       fix-x509-private-key-tests-and-test_suse-on-sle12-68.patch
+# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/685
+Patch145:       enhance-cleanup-mechanism-after-salt-bundle-upgrade-.patch
 
 ### IMPORTANT: The line below is used as a snippet marker. Do not touch it.
 ### SALT PATCHES LIST END