From b08b37d00465050e742d55983f16e6fdf482f1a2 Mon Sep 17 00:00:00 2001 From: zhuofeng Date: Wed, 27 Mar 2024 15:00:20 +0800 Subject: [PATCH] fix ras-mc-ctl.service startup failed when selinux is on (cherry picked from commit c200e16c474b0ffb6889e00ef57f9e53e40ab93c) --- ...ce-startup-failed-when-selinux-is-no.patch | 25 +++++++++++++++++++ rasdaemon.spec | 9 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 fix-ras-mc-ctl.service-startup-failed-when-selinux-is-no.patch diff --git a/fix-ras-mc-ctl.service-startup-failed-when-selinux-is-no.patch b/fix-ras-mc-ctl.service-startup-failed-when-selinux-is-no.patch new file mode 100644 index 0000000..45abe97 --- /dev/null +++ b/fix-ras-mc-ctl.service-startup-failed-when-selinux-is-no.patch @@ -0,0 +1,25 @@ +From fd9341f5f7f3896c4de2a9a90d7dc366fd2ffedc Mon Sep 17 00:00:00 2001 +From: shixuantong +Date: Thu, 1 Dec 2022 12:39:11 +0000 +Subject: [PATCH] fix ras-mc-ctl.service startup failed when selinux is on + +--- + util/ras-mc-ctl.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in +index 9198a23..888b4e8 100755 +--- a/util/ras-mc-ctl.in ++++ b/util/ras-mc-ctl.in +@@ -39,7 +39,7 @@ my $dbname = "@RASSTATEDIR@/@RAS_DB_FNAME@"; + my $prefix = "@prefix@"; + my $sysconfdir = "@sysconfdir@"; + my $dmidecode = find_prog ("dmidecode"); +-my $modprobe = find_prog ("modprobe") or exit (1); ++my $modprobe = find_prog ("modprobe"); + + my $has_aer = 0; + my $has_arm = 0; +-- +2.33.0 + diff --git a/rasdaemon.spec b/rasdaemon.spec index 3b5313c..c760347 100644 --- a/rasdaemon.spec +++ b/rasdaemon.spec @@ -1,6 +1,6 @@ Name: rasdaemon Version: 0.8.0 -Release: 2 +Release: 3 License: GPLv2 Summary: Utility to get Platform Reliability, Availability and Serviceability (RAS) reports via the Kernel tracing events URL: https://github.com/mchehab/rasdaemon.git @@ -21,6 +21,7 @@ Requires(preun): systemd Requires(postun): systemd Patch0: backport-Fix-potential-overflow-with-some-arrays-at-page-isol.patch +Patch1: fix-ras-mc-ctl.service-startup-failed-when-selinux-is-no.patch Patch9000: bugfix-rasdaemon-wait-for-file-access.patch Patch9001: bugfix-fix-fd-check.patch @@ -82,6 +83,12 @@ fi /usr/bin/systemctl disable rasdaemon.service >/dev/null 2>&1 || : %changelog +* Wed Mar 27 2024 zhuofeng - 0.8.0-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix ras-mc-ctl.service startup failed when selinux is on + * Mon Mar 25 2024 zhangruifang - 0.8.0-2 - Type:bugfix - ID:NA -- Gitee