From: Sage Weil <sage@inktank.com>
Date: Tue, 1 Apr 2014 21:39:02 +0000 (-0700)
Subject: debian: move rbdmap config and sysvinit/upstart scripts into ceph-common
X-Git-Tag: v0.79~16^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17732dc0c8878ea58813ad543c5359cb811079cc;p=ceph.git

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 525617a6d87e..d49b4d790b93 100644
--- 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 cc4a67d2feae..a0647a5f51e0 100644
--- 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 9b26a3cda833..81f578e82e5a 100755
--- 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