packaging: apply udev hack rule to RHEL

In the RPM spec file there is a test to deploy the uuid hack udev rules for older udev operating systems. This includes CentOS and RHEL, but the check currently only is for CentOS, causing RHEL clients to get a bogus osd rules file. Adjust the conditional to apply to RHEL as well as CentOS. (The %{rhel} macro is defined in both platforms' redhat-rpm-config package.) Fixes http://tracker.ceph.com/issues/7245 Signed-off-by: Ken Dreyer <[email protected]>
dano · Jan 27, 2014 · 64a0b4f · 64a0b4f
1 parent cacdfd9
commit 64a0b4f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -315,7 +315,7 @@ chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config
 install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules
 install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-ceph-partuuid-workaround.rules
 
-%if 0%{?centos}
+%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