From b7e2228565e8489dd84a9830547fb9ab742b8631 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Fri, 6 Dec 2024 19:57:11 +0800 Subject: [PATCH] fix error info when removed after upgrade (cherry picked from commit 92c35be9eff3748383be36b893b477ab4f13114e) --- obs-server.spec | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/obs-server.spec b/obs-server.spec index f55c123..bd0dad4 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,7 +6,7 @@ Name: obs-server Version: 2.10.15 -Release: 11 +Release: 12 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -216,8 +216,14 @@ exit 0 %systemd_preun obsnotifyforward.service %systemd_preun obsredis.service %systemd_preun obsworker.service -semanage fcontext -d "/srv/obs(/.*)?" -semanage fcontext -d "/srv/obs/events(/.*)?" +Obs_Context=`semanage fcontext -l | grep '/srv/obs(/.*)?' | awk '{print $4}' | awk -F: '{print $3}'` +if [[ $Obs_Context == "var_lib_t" ]];then + semanage fcontext -d "/srv/obs(/.*)?" +fi +Events_Context=`semanage fcontext -l | grep '/srv/obs/events(/.*)?' | awk '{print $4}' | awk -F: '{print $3}'` +if [[ $Events_Context == "uuidd_var_run_t" ]];then + semanage fcontext -d "/srv/obs/events(/.*)?" +fi %preun -n obs-common %systemd_preun obsstoragesetup.service @@ -241,8 +247,14 @@ semanage fcontext -d "/srv/obs/events(/.*)?" %systemd_post obsnotifyforward.service %systemd_post obsredis.service %systemd_post obsworker.service -semanage fcontext -a -t var_lib_t "/srv/obs(/.*)?" -semanage fcontext -a -t uuidd_var_run_t "/srv/obs/events(/.*)?" +Obs_Context=`ls -l -Z /srv | grep obs | awk '{print $5}' | awk -F: '{print $3}'` +if [[ $Obs_Context != "var_lib_t" ]];then + semanage fcontext -a -t var_lib_t "/srv/obs(/.*)?" +fi +Events_Context=`ls -l -Z /srv/obs | grep events | awk '{print $5}' | awk -F: '{print $3}'` +if [[ $Events_Context != "uuidd_var_run_t" ]];then + semanage fcontext -a -t uuidd_var_run_t "/srv/obs/events(/.*)?" +fi restorecon -Rv /srv/obs/ cd /usr/lib64/obs-api/ruby/3.2.0/bin ls | awk '{print $1}' | for line in `xargs`;do chmod 755 $line;done @@ -498,6 +510,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/obsstoragesetup %changelog +* Fri Dec 06 2024 Ge Wang - 2.10.15-12 +- Fix error info when removed after upgrade + * Thu Jun 20 2024 Wenlong Zhang - 2.10.15-11 - rename mod_xforward to apache2-mod_xforward -- Gitee