From e44d1e07a71b24a1903fb6191559aa91eb3de612 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Fri, 18 Sep 2015 17:00:30 +0200 Subject: [PATCH] ceph.spec.in: Fix up (/var)/run/ceph creation Fixes: #13059 Signed-off-by: Boris Ranto --- ceph.spec.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 667ee11b84239..45f40b881de8c 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -637,7 +637,7 @@ mv $RPM_BUILD_ROOT/sbin/mount.fuse.ceph $RPM_BUILD_ROOT/usr/sbin/mount.fuse.ceph #set up placeholder directories mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph -%if (! 0%{?suse_version}) || ( 0%{?suse_version} && (! 0%{?_with_systemd}) ) +%if ! 0%{?_with_systemd} mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ceph %endif mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph @@ -673,13 +673,13 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig %if 0%{?_with_systemd} + systemd-tmpfiles --create %if 0%{?suse_version} %service_add_post ceph.target %endif %else /sbin/chkconfig --add ceph %endif -mkdir -p %{_localstatedir}/run/ceph/ %preun %if 0%{?_with_systemd} @@ -818,7 +818,9 @@ mkdir -p %{_localstatedir}/run/ceph/ %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-osd %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-mds %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-rgw +%if ! 0%{?_with_systemd} %attr(770,ceph,ceph) %dir %{_localstatedir}/run/ceph +%endif ################################################################################# %files -n ceph-common -- 2.39.5