debian: move rbdmap config and sysvinit/upstart scripts into ceph-common

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

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 525617a6d87e4691c05231f0a552b8a32fa4241d..d49b4d790b9350f7ec1a22c1ec23403fd0e68efb 100644 (file)
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -21,3 +21,5 @@ usr/share/man/man8/rbd.8
 usr/share/ceph/known_hosts_drop.ceph.com
 usr/share/ceph/id_dsa_drop.ceph.com
 usr/share/ceph/id_dsa_drop.ceph.com.pub
+etc/ceph/rbdmap
+etc/init.d/rbdmap
\ No newline at end of file

diff --git a/debian/ceph.install b/debian/ceph.install
index cc4a67d2feaeeee7dc57991cb1c057d51d681d5c..a0647a5f51e0df0bdc20d449ae9a3577a8ec3f88 100644 (file)
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -31,5 +31,3 @@ 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/ceph/rbdmap
-etc/init.d/rbdmap

diff --git a/debian/rules b/debian/rules
index 9b26a3cda833dc2a008313f320de99b56dcc1d79..81f578e82e5a216352e5a347527be20136551dc8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,8 @@ binary-arch: build install
        # per package, so do this ourselves
        install -d -m0755 debian/ceph/etc/init
        install -m0644 src/upstart/ceph*.conf debian/ceph/etc/init
-       install -m0644 src/upstart/rbdmap.conf debian/ceph/etc/init
+       install -d -m0755 debian/ceph-common/etc/init
+       install -m0644 src/upstart/rbdmap.conf debian/ceph-common/etc/init
        install -d -m0755 debian/ceph-mds/etc/init
        mv debian/ceph/etc/init/ceph-mds* debian/ceph-mds/etc/init
        install -d -m0755 debian/radosgw/etc/init