From: Derek Yarnell Date: Mon, 27 Jan 2014 19:27:51 +0000 (-0700) Subject: packaging: apply udev hack rule to RHEL X-Git-Tag: v0.78~269^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1149%2Fhead;p=ceph.git 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 --- diff --git a/ceph.spec.in b/ceph.spec.in index bcc411f8cbf5..d18aa4f984af 100644 --- 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