diff options
| author | Sage Weil <sage@inktank.com> | 2012-06-02 14:49:02 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-06-02 14:49:02 -0700 |
| commit | ac28c260f3a3003ba6de88a91469ef452bbb589d (patch) | |
| tree | ed143828063fb7d9a6d577ccc4f88c31152c690a /debian | |
| parent | c48de3ad7a86d91e11d41d6240aadf7ec187d1d9 (diff) | |
| parent | 3764ca6115fe7c0bf8dcba448af012625ea5abc3 (diff) | |
| download | ceph-ac28c260f3a3003ba6de88a91469ef452bbb589d.tar.gz | |
Merge remote branch 'gh/chef-3'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/ceph.dirs | 3 | ||||
| -rw-r--r-- | debian/ceph.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/debian/ceph.dirs b/debian/ceph.dirs index a35b85c5e1c..fcb92587308 100644 --- a/debian/ceph.dirs +++ b/debian/ceph.dirs @@ -1,3 +1,6 @@ etc/ceph var/log/ceph var/lib/ceph/tmp +var/lib/ceph/mon +var/lib/ceph/osd +var/lib/ceph/mds 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 |