ceph-disk: install and package

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index afee331428916e0d2099b0119506f60ae0929fc6..d72c207f9a097ec6d7668f7fbb3f5624d6f7d6c5 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -434,6 +434,7 @@ fi
 %{_libdir}/rados-classes/libcls_lock.so*
 %{_libdir}/rados-classes/libcls_kvs.so*
 %{_libdir}/rados-classes/libcls_refcount.so*
+/sbin/ceph-disk
 /sbin/ceph-disk-activate
 /sbin/ceph-disk-prepare
 /sbin/ceph-create-keys

diff --git a/debian/ceph.install b/debian/ceph.install
index b942679fd738302b89238982bab93104735115b1..f174f55691f5182458af8b679e0df5f68ad9e3c7 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -7,6 +7,7 @@ usr/bin/ceph-mon
 usr/bin/ceph-osd
 usr/bin/ceph-debugpack
 usr/bin/ceph_mon_store_converter
+sbin/ceph-disk usr/sbin/
 sbin/ceph-disk-prepare usr/sbin/
 sbin/ceph-disk-activate usr/sbin/
 sbin/ceph-create-keys usr/sbin/

diff --git a/src/Makefile.am b/src/Makefile.am
index bcf899b432f97b7c2c80e1df1ca19e524c95faa5..869c806e42630e9449b475854ba05b8a3f078e68 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ bin_PROGRAMS =
 bin_DEBUGPROGRAMS =
 sbin_PROGRAMS =
 sbin_SCRIPTS = \
+       ceph-disk \
        ceph-disk-prepare \
        ceph-disk-activate \
        ceph-create-keys \
@@ -1145,6 +1146,7 @@ EXTRA_DIST += \
        $(srcdir)/upstart/radosgw.conf \
        $(srcdir)/upstart/radosgw-all.conf \
        $(srcdir)/upstart/radosgw-all-starter.conf \
+       ceph-disk \
        ceph-disk-prepare \
        ceph-disk-activate \
        ceph-create-keys \