From afe6bd89f8a1588fb67063d1a08a4be8c1ab2ce6 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Sat, 11 Oct 2014 18:20:36 +0200 Subject: [PATCH] rpm: 95-ceph-osd-alt.rules is not needed for centos7 / rhel7 The || instead of && had it always installed. That was fixed in EPEL already. http://tracker.ceph.com/issues/9747 Fixes: #9747 Signed-off-by: Loic Dachary (cherry picked from commit 5ff4a850a0d809b3f25988c6cceb82c35095ef84) --- ceph.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 545445407233b..182cd203920b9 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -337,7 +337,7 @@ install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rul install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-ceph-partuuid-workaround.rules %endif -%if (0%{?rhel} || 0%{?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 install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules