From 36e9f763e9dfba10e9bc6623913f5b8936cffdeb Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Tue, 25 Mar 2025 16:01:07 +0000 Subject: [PATCH] ceph.spec.in: cleanup sysctl_apply check sysctl_apply macro is supported on systemd since v215 [1]. This macro should be supported from Centos 7.2 and above, since we use C9 to build (and 8 is EOL) - we can cleanup this check. [1] https://github.com/systemd/systemd/commit/b532bdeae9b13fe93a54850f5e7f99c753bda6fa Signed-off-by: Matan Breizman --- ceph.spec.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 8c022125eba..12dbad48d6d 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -2340,11 +2340,7 @@ fi if [ $1 -eq 1 ] ; then /usr/bin/systemctl start ceph-osd.target >/dev/null 2>&1 || : fi -%if 0%{?sysctl_apply} - %sysctl_apply 90-ceph-osd.conf -%else - /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null 2>&1 || : -%endif +%sysctl_apply 90-ceph-osd.conf %preun osd %if 0%{?suse_version} -- 2.39.5