]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: 95-ceph-osd-alt.rules is not needed for centos7 / rhel7
authorLoic Dachary <loic-201408@dachary.org>
Sat, 11 Oct 2014 16:20:36 +0000 (18:20 +0200)
committerSage Weil <sage@redhat.com>
Mon, 13 Oct 2014 15:16:40 +0000 (08:16 -0700)
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 <loic-201408@dachary.org>
(cherry picked from commit 5ff4a850a0d809b3f25988c6cceb82c35095ef84)

ceph.spec.in

index 2931120647458fecf524a41592473ae8a256a99a..8a37b03310cde4aba299750de72305e3e464f769 100644 (file)
@@ -379,7 +379,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