]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10653 from dachary/wip-10495-jewel
authorLoic Dachary <loic@dachary.org>
Wed, 24 Aug 2016 16:57:23 +0000 (18:57 +0200)
committerGitHub <noreply@github.com>
Wed, 24 Aug 2016 16:57:23 +0000 (18:57 +0200)
jewel : 60-ceph-partuuid-workaround-rules still needed by debian jessie (udev 215-17)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
ceph.spec.in

diff --cc ceph.spec.in
index e161e67788a58c836befeb897ff1e4287d0d092e,53dbb4e83b694342cee8f6089af90304a457be34..b2e4b12a08a5d3a9dfd60ccf2d2148a9eff47ae4
@@@ -722,7 -708,10 +722,8 @@@ ln -sf %{_sbindir}/mount.ceph %{buildro
  
  # udev rules
  install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
+ install -m 0644 -D udev/60-ceph-by-parttypeuuid.rules %{buildroot}%{_udevrulesdir}/60-ceph-by-parttypeuuid.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
  
  #set up placeholder directories
  mkdir -p %{buildroot}%{_sysconfdir}/ceph