From 491fa555f9b98c3a0b60a5a3b5cde9a79064f13a Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 8 Jun 2020 20:15:47 +0800 Subject: [PATCH] ceph.spec.in: use %{_presetdir} for preset settings the systemd preset settings should not be located under /usr/libexec ``` $ rpm --eval "%{_presetdir}" /usr/lib/systemd/system-preset ``` see also https://www.freedesktop.org/software/systemd/man/systemd.preset.html Signed-off-by: Kefu Chai --- ceph.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 3a393bbceee..35de67371f2 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1281,7 +1281,7 @@ install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_fillupdir}/sysconfig.%{name} %endif install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf -install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset +install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_presetdir}/50-ceph.preset mkdir -p %{buildroot}%{_sbindir} install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf @@ -1363,7 +1363,7 @@ rm -rf %{buildroot} %{_bindir}/osdmaptool %{_bindir}/ceph-kvstore-tool %{_bindir}/ceph-run -%{_libexecdir}/systemd/system-preset/50-ceph.preset +%{_presetdir}/50-ceph.preset %{_sbindir}/ceph-create-keys %dir %{_libexecdir}/ceph %{_libexecdir}/ceph/ceph_common.sh -- 2.39.5