From 7b5517294bc2aad87340d602b7066a466e084d9f Mon Sep 17 00:00:00 2001 From: zhangxiaoyu Date: Thu, 15 Sep 2022 10:44:07 +0800 Subject: [PATCH] shield upgrade error if lcrd not exist Signed-off-by: zhangxiaoyu --- iSulad.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/iSulad.spec b/iSulad.spec index 5da7092..c7152ae 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.0.16 -%global _release 5 +%global _release 6 %global is_systemd 1 %global enable_shimv2 1 %global is_embedded 1 @@ -148,13 +148,13 @@ rm -rf %{buildroot} # support update from lcrd to isulad, will remove in next version if [ "$1" = "2" ]; then %if 0%{?is_systemd} -systemctl stop lcrd -systemctl disable lcrd +systemctl stop lcrd &>/dev/null +systemctl disable lcrd &>/dev/null if [ -e %{_sysconfdir}/isulad/daemon.json ];then sed -i 's#/etc/default/lcrd/hooks#/etc/default/isulad/hooks#g' %{_sysconfdir}/isulad/daemon.json fi %else -/sbin/chkconfig --del lcrd +/sbin/chkconfig --del lcrd &>/dev/null %endif fi @@ -247,6 +247,12 @@ fi %endif %changelog +* Thu Sep 15 2022 zhangxiaoyu - 2.0.16-6 +- Type: enhancement +- ID: NA +- SUG: NA +- DESC: shield upgrade error if lcrd not exist + * Tue Sep 13 2022 zhangxiaoyu - 2.0.16-5 - Type: enhancement - ID: NA