From 24edb2a04e2e7d70811a41cf6919fdad1c056456 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 23 2022 16:18:12 +0000 Subject: import stalld-1.17-2.el8 --- diff --git a/SOURCES/Start-stalld-service-as-initrc_t.patch b/SOURCES/Start-stalld-service-as-initrc_t.patch new file mode 100644 index 0000000..4a88577 --- /dev/null +++ b/SOURCES/Start-stalld-service-as-initrc_t.patch @@ -0,0 +1,27 @@ +From 476152742021303d2defeb69f524bcc302618081 Mon Sep 17 00:00:00 2001 +From: Leah Leshchinsky +Date: Mon, 29 Aug 2022 14:07:39 -0400 +Subject: [PATCH] Start stalld service as initrc_t + +Stalld currently runs as an unconfined_service_t. + +Edit to service file so that the daemon is launched as an initrc_t. + +Signed-off-by: Leah Leshchinsky + +diff --git a/redhat/stalld.service b/redhat/stalld.service +index e0eb4b77b0a7..bcd4b767f629 100644 +--- a/redhat/stalld.service ++++ b/redhat/stalld.service +@@ -9,7 +9,7 @@ ExecStartPre=/usr/bin/throttlectl off + + # In case the regex passed to IT or IP includes C escape sequences, + # use ${IT} or ${IP} instead of $IT or $IP +-ExecStart=/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP ++ExecStart=/bin/sh -c "/usr/bin/stalld --systemd $CLIST $AGGR $BP $BR $BD $THRESH $LOGGING $FG $PF $IT $IP" + ExecStopPost=/usr/bin/throttlectl on + CPUSchedulingPolicy=fifo + CPUSchedulingPriority=10 +-- +2.31.1 + diff --git a/SPECS/stalld.spec b/SPECS/stalld.spec index c5ea049..7665943 100644 --- a/SPECS/stalld.spec +++ b/SPECS/stalld.spec @@ -1,6 +1,6 @@ Name: stalld Version: 1.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Daemon that finds starving tasks and gives them a temporary boost License: GPLv2 @@ -14,6 +14,8 @@ BuildRequires: systemd-rpm-macros Requires: systemd +Patch0: Start-stalld-service-as-initrc_t.patch + %description The stalld program monitors the set of system threads, looking for threads that are ready-to-run but have not @@ -23,7 +25,7 @@ boost using the SCHED_DEADLINE policy. The default is to allow 10 microseconds of runtime for 1 second of clock time. %prep -%autosetup +%autosetup -p1 %build %make_build CFLAGS="%{optflags} %{build_cflags} -DVERSION="\\\"%{version}\\\""" LDFLAGS="%{build_ldflags}" @@ -51,6 +53,10 @@ allow 10 microseconds of runtime for 1 second of clock time. %systemd_postun_with_restart %{name}.service %changelog +* Thu Sep 08 2022 Leah Leshchinsky - 1.17-2 +- Start stalld service as initrc_t +Resolves:rhbz#2112366 + * Thu Jul 14 2022 John Kacur - 1.17-1 - rebase to upstream v1.17 Resolves:rhbz#2107273