packages/lxcfs-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lxcfs_tools: hide error when isula info is abnormal

Browse Source 
Signed-off-by: vegbir <yangjiaqi16@huawei.com>
This commit is contained in:
vegbir 2023-12-27 07:29:54 +00:00
parent f82895ade6
commit d8f5270940
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lxcfs-tools.spec
View File

@ -1,7 +1,7 @@
#Basic Information #Basic Information
Name: lxcfs-tools Name: lxcfs-tools
Version: 0.3 Version: 0.3
Release: 31 Release: 32
Summary: toolkit for lxcfs to remount a running isulad Summary: toolkit for lxcfs to remount a running isulad
License: Mulan PSL v2 License: Mulan PSL v2
URL: https://gitee.com/openeuler/lxcfs-tools 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 Patch3: 0003-retry-10-times-to-avoid-isulad-unavailable.patch
Patch4: 0004-add-dt-test.patch Patch4: 0004-add-dt-test.patch
Patch5: 0005-add-riscv64-to-syscall-build.patch Patch5: 0005-add-riscv64-to-syscall-build.patch
%ifarch sw_64 %ifarch sw_64
Patch6: lxcfs-tools-sw.patch Patch1000: lxcfs-tools-sw.patch
%endif %endif
%ifarch loongarch64 %ifarch loongarch64
Patch7: add-loong64-support.patch Patch1001: add-loong64-support.patch
%endif %endif
#Dependency #Dependency
@ -54,8 +55,8 @@ make tests
%preun %preun
%post %post
GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "\/.*"` GRAPH=`isula info 2>/dev/null | grep -Eo "iSulad Root Dir:.+" | grep -Eo "\/.*"`
if [ "$GRAPH" == "" ]; then if [ x"$GRAPH" == "x" ]; then
GRAPH="/var/lib/isulad" GRAPH="/var/lib/isulad"
fi fi
@ -103,6 +104,12 @@ rm -rfv %{buildroot}
%changelog %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 * Fri Aug 18 2023 panchenbo <panchenbo@kylinsec.com.cn> - 0.3-31
- add loongarch64 support - add loongarch64 support