From 343d28e6406fd5359674e43c09643843d8bed665 Mon Sep 17 00:00:00 2001
From: openeuler-sync-bot <infra@openeuler.sh>
Date: Mon, 5 Feb 2024 01:33:37 +0000
Subject: [PATCH] !664 [sync] PR-651: iSulad: keep the service status unchanged
 after iSulad service upgrade * iSulad: keep the service status unchanged
 after iSulad service upgrade

---
 iSulad.spec | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/iSulad.spec b/iSulad.spec
index 3f2179e..5d49d72 100644
--- a/iSulad.spec
+++ b/iSulad.spec
@@ -1,5 +1,5 @@
 %global _version 2.1.4
-%global _release 4
+%global _release 5
 %global is_systemd 1
 %global enable_criv1 1
 %global enable_shimv2 1
@@ -269,11 +269,15 @@ if [ -e %{_unitdir}/lcrd.service.rpmsave ]; then
     mv %{_unitdir}/lcrd.service.rpmsave %{_unitdir}/isulad.service
     sed -i 's/lcrd/isulad/g' %{_unitdir}/isulad.service
 fi
+# During the isulad upgrade process, the isulad service may still be running, but the service may be unavailable
+# due to configuration updates and other reasons.
+# it may fail if the X package is upgraded synchronously with isulad and depends on the isulad command,
+# For example syscontianer-tools and lxcfs-tools.
+# Therefore, after upgrading isulad, if the original status of isulad is running,
+# we need to restart isulad to ensure that the service is available during the upgrade process.
 systemctl status isulad | grep 'Active:' | grep 'running'
 if [ $? -eq 0 ]; then
   systemctl restart isulad
-else
-  systemctl start isulad
 fi
 %else
 /sbin/service isulad status | grep 'Active:' | grep 'running'
@@ -338,6 +342,12 @@ fi
 %endif
 
 %changelog
+* Fri Dec 29 2023 yangjiaqi <yangjiaqi16@huawei.com> - 2.1.4-5
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: keep the service status unchanged after iSulad service upgrade
+
 * Thu Dec 28 2023 leizhongkai <leizhongkai@huawei.com> - 2.1.4-4
 - Type: bugfix
 - ID: NA