lxcfs-tools:hide error when isula info is abnormal

Signed-off-by: vegbir <yangjiaqi16@huawei.com>
This commit is contained in:
vegbir 2023-12-27 07:42:42 +00:00
parent 37694ea698
commit 4605d083a3
2 changed files with 11 additions and 4 deletions

View File

@ -1,7 +1,7 @@
#Basic Information
Name: lxcfs-tools
Version: 0.3
Release: 32
Release: 33
Summary: toolkit for lxcfs to remount a running isulad
License: Mulan PSL v2
URL: https://gitee.com/openeuler/lxcfs-tools
@ -13,8 +13,9 @@ Patch2: 0002-enable-external-linkmode-for-cgo-build.patch
Patch3: 0003-retry-10-times-to-avoid-isulad-unavailable.patch
Patch4: 0004-add-dt-test.patch
Patch5: 0005-add-riscv64-to-syscall-build.patch
%ifarch sw_64
Patch6: 0006-lxcfs-tools-sw.patch
Patch1000: lxcfs-tools-sw.patch
%endif
#Dependency
@ -51,8 +52,8 @@ make tests
%preun
%post
GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"`
if [ "$GRAPH" == "" ]; then
GRAPH=`isula info 2>/dev/null | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"`
if [ x"$GRAPH" == "x" ]; then
GRAPH="/var/lib/isulad"
fi
@ -100,6 +101,12 @@ rm -rfv %{buildroot}
%changelog
* Wed Dec 27 2023 yangjiaqi <yangjiaqi16@huawei.com> - 0.3-33
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:hide error when isula info is abnormal
* Thu Aug 31 2023 yangjiaqi<yangjiaqi16@huawei.com> - 0.3-32
- Type:bugfix
- CVE:NA