From d40de56d834134b2e0b6dc3736e6f817f6395cf6 Mon Sep 17 00:00:00 2001 From: xyn-coder Date: Tue, 17 Oct 2023 14:55:20 +0800 Subject: [PATCH] fix env restore bug --- 0007-restore-env-after-selinux-status-changes.patch | 2 +- oemaker.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/0007-restore-env-after-selinux-status-changes.patch b/0007-restore-env-after-selinux-status-changes.patch index 857d6ff..65a87a8 100644 --- a/0007-restore-env-after-selinux-status-changes.patch +++ b/0007-restore-env-after-selinux-status-changes.patch @@ -95,7 +95,7 @@ index 0000000..15f6311 +{ + # 使用环境变量执行恢复 + source /etc/profile >> /dev/null -+ if [ "$SELINUX_FLAG" -eq 0 ] || [ "$SELINUX_FLAG" -eq 1 ]; then ++ if [ "x$SELINUX_FLAG" == "x0" ] || [ "x$SELINUX_FLAG" == "x1" ]; then + setenforce "${SELINUX_FLAG}" + else + echo "/etc/profile have no value: SELINUX_FLAG" diff --git a/oemaker.spec b/oemaker.spec index ba15ce6..305db85 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -11,7 +11,7 @@ Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 2.0.3 -Release: 8 +Release: 9 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -135,6 +135,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Tue Oct 17 2023 xiangyuning - 2.0.3-9 +- ID:NA +- SUG:NA +- DESC: fix env restore bug + * Tue Jun 13 2023 zhaotianyang - 2.0.3-8 - ID:NA - SUG:NA -- Gitee