summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTommi Virtanen <tv@inktank.com>2012-05-07 12:12:48 -0700
committerTommi Virtanen <tv@inktank.com>2012-05-23 14:02:34 -0700
commit176a14aef90e7ed0a241f48e5c6667ff1c100e50 (patch)
treeb4e2809cba11892ce1bb50676b76c39112674d59 /debian
parent475e07a256410e7ab4201ac5ad78cc35f61e6a2f (diff)
downloadceph-176a14aef90e7ed0a241f48e5c6667ff1c100e50.tar.gz
debian, upstart, osd: osd disk preparation and activation scripts
Signed-off-by: Tommi Virtanen <tv@inktank.com>
Diffstat (limited to 'debian')
-rw-r--r--debian/ceph.install2
-rwxr-xr-xdebian/rules4
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/ceph.install b/debian/ceph.install
index bdcf2497eaf..51fb31104ab 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -7,6 +7,8 @@ usr/bin/ceph-mon
usr/bin/ceph-mds
usr/bin/ceph-osd
usr/bin/ceph-debugpack
+sbin/ceph-disk-prepare usr/sbin/
+sbin/ceph-disk-activate usr/sbin/
sbin/mkcephfs
usr/lib/ceph/ceph_common.sh
usr/lib/rados-classes/*
diff --git a/debian/rules b/debian/rules
index 8bed776f09b..a10c2e52000 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,10 @@ binary-arch: build install
dh_install --sourcedir=$(DESTDIR) --list-missing
dh_installlogrotate
dh_installinit --no-start
+ # dh_installinit is only set up to handle one upstart script
+ # per package, so do this ourselves
+ install -d -m0755 debian/ceph/etc/init
+ install -m0644 src/upstart/*.conf debian/ceph/etc/init
dh_installman
dh_lintian
dh_link