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 0000000000000000000000000000000000000000..45abe97882231d6c11df1baab9c902eaa3ab18b4 --- /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 a7dbdc9b97ef535998ce8cb16cfb8290b72c4827..50bcf3f354b98b28b39430988c742c335c8fbc04 100644 --- a/rasdaemon.spec +++ b/rasdaemon.spec @@ -1,6 +1,6 @@ Name: rasdaemon Version: 0.6.8 -Release: 5 +Release: 6 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 @@ -43,6 +43,7 @@ Patch9016: 0001-rasdaemon-fix-return-value-type-issue-of-read-write-.patch Patch9017: 0002-rasdaemon-fix-issue-of-signed-and-unsigned-integer-c.patch Patch9018: 0003-rasdaemon-Add-support-for-creating-the-vendor-error-.patch Patch9019: 0004-rasdaemon-Add-four-modules-supported-by-HiSilicon-co.patch +Patch9020: fix-ras-mc-ctl.service-startup-failed-when-selinux-is-no.patch %description The rasdaemon program is a daemon which monitors the platform @@ -88,6 +89,12 @@ rm INSTALL %{buildroot}/usr/include/*.h /usr/bin/systemctl enable rasdaemon.service >/dev/null 2>&1 || : %changelog +* Tue Aug 29 2023 zhangnan -0.6.8-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:sync patch + * Sat Jun 17 2023 yanglongkang - 0.6.8-5 - Type:bugfix - ID:NA