rpm: drop udev/95-ceph-osd-alt.rules

This udev rules file was needed on older RHEL platforms, which are
unsupported as of jewel.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ee4acb31593dd33da99138998fd0f30ebc2f1a6e)

diff --git a/Makefile.am b/Makefile.am
index 81cb29038c68e5369f716710e8c6f1923cef6deb..6fa1a00a64be9a4006d3c4cea7ffa45811c4bb53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,6 @@ EXTRA_DIST += \
        etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds \
        udev/50-rbd.rules \
        udev/95-ceph-osd.rules \
-       udev/95-ceph-osd-alt.rules \
        share/known_hosts_drop.ceph.com \
        share/id_dsa_drop.ceph.com \
        share/id_dsa_drop.ceph.com.pub

diff --git a/ceph.spec.in b/ceph.spec.in
index 71edae6c7dd6052bc1a5ca2cfeabebfc51b3cb8d..a2a90d2c8a3cba3e57dfdbed0e9278996c8d925f 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -705,18 +705,9 @@ install -m 0644 -D etc/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds %{buildro
 
 # udev rules
 install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
-
-%if (0%{?rhel} && 0%{?rhel} < 7)
-install -m 0644 -D udev/95-ceph-osd-alt.rules %{buildroot}/lib/udev/rules.d/95-ceph-osd.rules
-%else
-install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}/lib/udev/rules.d/95-ceph-osd.rules
-%endif
-
-%if 0%{?rhel} >= 7 || 0%{?fedora} || 0%{?suse_version}
-mv %{buildroot}/lib/udev/rules.d/95-ceph-osd.rules %{buildroot}/usr/lib/udev/rules.d/95-ceph-osd.rules
+install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules
 mv %{buildroot}/sbin/mount.ceph %{buildroot}/usr/sbin/mount.ceph
 mv %{buildroot}/sbin/mount.fuse.ceph %{buildroot}/usr/sbin/mount.fuse.ceph
-%endif
 
 #set up placeholder directories
 mkdir -p %{buildroot}%{_sysconfdir}/ceph

diff --git a/udev/95-ceph-osd-alt.rules b/udev/95-ceph-osd-alt.rules
deleted file mode 100644 (file)
index 3306e24..0000000
--- a/udev/95-ceph-osd-alt.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-#  Check gpt partion for ceph tags and activate
-ACTION=="add", SUBSYSTEM=="block", \
-  ENV{DEVTYPE}=="partition", \
-  ENV{ID_PART_TABLE_TYPE}=="gpt", \
-  RUN+="/usr/sbin/ceph-disk-udev $number $name $parent"