packages/iSulad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!444 shield upgrade error if lcrd not exist

Browse Source 
From: @zh_xiaoyu 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2022-09-15 06:37:45 +00:00 committed by Gitee
commit 3bae4c0c8e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iSulad.spec
View File

@ -1,5 +1,5 @@
%global _version 2.0.16 %global _version 2.0.16
%global _release 5 %global _release 6
%global is_systemd 1 %global is_systemd 1
%global enable_shimv2 1 %global enable_shimv2 1
%global is_embedded 1 %global is_embedded 1
@ -148,13 +148,13 @@ rm -rf %{buildroot}
# support update from lcrd to isulad, will remove in next version # support update from lcrd to isulad, will remove in next version
if [ "$1" = "2" ]; then if [ "$1" = "2" ]; then
%if 0%{?is_systemd} %if 0%{?is_systemd}
systemctl stop lcrd systemctl stop lcrd &>/dev/null
systemctl disable lcrd systemctl disable lcrd &>/dev/null
if [ -e %{_sysconfdir}/isulad/daemon.json ];then if [ -e %{_sysconfdir}/isulad/daemon.json ];then
sed -i 's#/etc/default/lcrd/hooks#/etc/default/isulad/hooks#g' %{_sysconfdir}/isulad/daemon.json sed -i 's#/etc/default/lcrd/hooks#/etc/default/isulad/hooks#g' %{_sysconfdir}/isulad/daemon.json
fi fi
%else %else
/sbin/chkconfig --del lcrd /sbin/chkconfig --del lcrd &>/dev/null
%endif %endif
fi fi
@ -247,6 +247,12 @@ fi
%endif %endif
%changelog %changelog
* Thu Sep 15 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.16-6
- Type: enhancement
- ID: NA
- SUG: NA
- DESC: shield upgrade error if lcrd not exist
* Tue Sep 13 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.16-5 * Tue Sep 13 2022 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.16-5
- Type: enhancement - Type: enhancement
- ID: NA - ID: NA