From f1d6c0a6486f52f2841f707b429bf599a9e46f38 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 10 Jul 2015 08:28:16 +0200 Subject: [PATCH] ceph.spec.in: fix 95-ceph-osd.rules installation The 95-ceph-osd.rules files was not getting installed properly on SUSE to a faulty conditional. Signed-off-by: Nathan Cutler (cherry picked from commit f83d9477eecd85ec43e526e3497c1261f7fd510e) --- ceph.spec.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index a35f589f1517b..6b57c26154a3f 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -601,11 +601,21 @@ 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} && 0%{?rhel} < 7) +%if 0%{?rhel} +%if %{rhel} < 7 install -m 0644 -D udev/95-ceph-osd-alt.rules $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 -- 2.39.5