From cd2fa4edad35dd93f8468e1a5fd3d91cf605d817 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 31 Jul 2015 15:16:30 -0400 Subject: [PATCH] ceph.spec: install the new systemd-based udev rules from ddiss Signed-off-by: Sage Weil (cherry picked from commit 8a67561220e47392a13df14a34cbd23b4c85629a) [ddiss@suse.de: rebase against SES2 spec file] --- ceph.spec.in | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index a9a03ed8d6df5..e58e082e0629c 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -611,22 +611,16 @@ install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildro install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT%{_udevrulesdir}/50-rbd.rules install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT%{_udevrulesdir}/60-ceph-partuuid-workaround.rules -%if 0%{?rhel} -%if %{rhel} < 7 +%if (0%{?rhel} && 0%{?rhel} < 7) install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules %else +%if 0%{?_with_systemd} +install -m 0644 -D udev/95-ceph-osd.rules.systemd $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules +%else install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules %endif %endif -%if 0%{?fedora} -install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules -%endif - -%if 0%{?suse_version} -install -m 0644 -D systemd/udev-rules.d-95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules -%endif - %if 0%{?rhel} >= 7 || 0%{?fedora} || 0%{?suse_version} mv $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/95-ceph-osd.rules mv $RPM_BUILD_ROOT/sbin/mount.ceph $RPM_BUILD_ROOT/usr/sbin/mount.ceph -- 2.39.5