install rules for init-rbdmap

Signed-off-by: Laurent Barbe <laurent@ksperis.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index ce65db69410231b5c78d80ee89c08f77f9a9897f..0cab8124ac366ad038173db09f6be5e1784cbb64 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -283,6 +283,8 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
 install -D src/init-radosgw.sysv $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
+install -D src/init-rbd $RPM_BUILD_ROOT%{_initrddir}/rbdmap
+install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/rbdmap
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 ln -sf ../../etc/init.d/ceph %{buildroot}/%{_sbindir}/rcceph
 ln -sf ../../etc/init.d/ceph-radosgw %{buildroot}/%{_sbindir}/rcceph-radosgw
@@ -405,6 +407,8 @@ fi
 %config %{_sysconfdir}/bash_completion.d/rados
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
 %config %{_sysconfdir}/bash_completion.d/rbd
+%{_initrddir}/rbdmap
+%config(noreplace) %{_sysconfdir}/rbdmap
 %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 %config(noreplace) %{_sysconfdir}/logrotate.d/radosgw
 %{_mandir}/man8/ceph-mon.8*

diff --git a/debian/ceph.install b/debian/ceph.install
index 69dfc6d5954247e84b598b6ad1e33b371ea20c4a..f29450f416392d936841ac738ce76c6ee5dd3067 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -28,3 +28,5 @@ usr/share/man/man8/crushtool.8
 usr/share/man/man8/mkcephfs.8
 usr/share/man/man8/monmaptool.8
 usr/share/man/man8/osdmaptool.8
+etc/rbdmap
+etc/init.d/rbdmap

diff --git a/debian/rules b/debian/rules
index 98dd6ed6f19b4fc003dcc8b61f1fffbd870c8d2b..b6e2622b5625650e1a42aae37e3b436202dec399 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,8 @@ install: build
        install -D -m 644 udev/50-rbd.rules $(DESTDIR)/lib/udev/rules.d/50-rbd.rules
        install -D -m 644 udev/60-ceph-partuuid-workaround.rules $(DESTDIR)/lib/udev/rules.d/60-ceph-partuuid-workaround.rules
        install -D -m 644 udev/95-ceph-osd.rules $(DESTDIR)/lib/udev/rules.d/95-ceph-osd.rules
+       install -D -m 644 src/rbdmap $(DESTDIR)/etc/rbdmap
+       install -D -m 755 src/init-rbdmap $(DESTDIR)/etc/init.d/rbdmap
 
 # Add here commands to install the package into debian/testpack.
 # Build architecture-independent files here.

diff --git a/src/Makefile.am b/src/Makefile.am
index 3f8369bfeda0f09f0ec3d0b2bd2374118f2d55bd..d9305ea07383678cf4ee07f8bd1e10be7897a628 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1219,6 +1219,7 @@ EXTRA_DIST += \
        ceph-run $(srcdir)/ceph_common.sh \
        $(srcdir)/init-radosgw \
        $(srcdir)/init-radosgw.sysv \
+       $(srcdir)/init-rbdmap \
        $(srcdir)/ceph-clsinfo $(srcdir)/make_version $(srcdir)/check_version \
        $(srcdir)/.git_version \
        $(srcdir)/ceph-rbdnamer \