!61 lxcfs_tools: hide error when isula info is abnormal

From: @vegbir 
Reviewed-by: @zhangsong234, @jingwoo 
Signed-off-by: @jingwoo
This commit is contained in:
openeuler-ci-bot 2023-12-27 09:36:17 +00:00 committed by Gitee
commit 59195e4121
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,7 +1,7 @@
#Basic Information
Name: lxcfs-tools
Version: 0.3
Release: 31
Release: 32
Summary: toolkit for lxcfs to remount a running isulad
License: Mulan PSL v2
URL: https://gitee.com/openeuler/lxcfs-tools
@ -13,11 +13,12 @@ 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: lxcfs-tools-sw.patch
Patch1000: lxcfs-tools-sw.patch
%endif
%ifarch loongarch64
Patch7: add-loong64-support.patch
Patch1001: add-loong64-support.patch
%endif
#Dependency
@ -54,8 +55,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
@ -103,6 +104,12 @@ rm -rfv %{buildroot}
%changelog
* Wed Dec 27 2023 yangjiaqi <yangjiaqi16@huawei.com> - 0.3-32
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:hide error when isula info is abnormal
* Fri Aug 18 2023 panchenbo <panchenbo@kylinsec.com.cn> - 0.3-31
- add loongarch64 support