From 4605d083a3c6f4dbb02f23b16e37220a1db6be5d Mon Sep 17 00:00:00 2001 From: vegbir Date: Wed, 27 Dec 2023 07:42:42 +0000 Subject: [PATCH] lxcfs-tools:hide error when isula info is abnormal Signed-off-by: vegbir --- 0006-lxcfs-tools-sw.patch => lxcfs-tools-sw.patch | 0 lxcfs-tools.spec | 15 +++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) rename 0006-lxcfs-tools-sw.patch => lxcfs-tools-sw.patch (100%) diff --git a/0006-lxcfs-tools-sw.patch b/lxcfs-tools-sw.patch similarity index 100% rename from 0006-lxcfs-tools-sw.patch rename to lxcfs-tools-sw.patch diff --git a/lxcfs-tools.spec b/lxcfs-tools.spec index bdbd7d1..f56f6d4 100644 --- a/lxcfs-tools.spec +++ b/lxcfs-tools.spec @@ -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 - 0.3-33 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:hide error when isula info is abnormal + * Thu Aug 31 2023 yangjiaqi - 0.3-32 - Type:bugfix - CVE:NA -- Gitee