diff options
| author | Dan Mick <dan.mick@redhat.com> | 2016-04-01 05:30:00 +0200 |
|---|---|---|
| committer | Dan Mick <dan.mick@redhat.com> | 2016-04-01 06:13:13 +0200 |
| commit | a29b96ad3a489ef2c95cf9db7a2fc2534bc7fccc (patch) | |
| tree | 730afef3d1a77fa8dba0b8be1115d73425d537a0 /debian/rules | |
| parent | Merge pull request #8382 from athanatos/wip-15241 (diff) | |
| download | ceph-a29b96ad3a489ef2c95cf9db7a2fc2534bc7fccc.tar.xz ceph-a29b96ad3a489ef2c95cf9db7a2fc2534bc7fccc.zip | |
debian/rules: put init-ceph in /etc/init.d/ceph, not ceph-base
When the package name changed from ceph to ceph-base, dh_installinit
started installing the init script into /etc/init.d/ceph-base. Fix
this by using --name ceph with dh_installinit, which requires
1) naming the .init file ceph-base.ceph.init, and
2) calling dh_installinit separately for each package
Fixes: http://tracker.ceph.com/issues/15329
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules index 91fa8b6acc8..cb6836ad77f 100755 --- a/debian/rules +++ b/debian/rules @@ -51,7 +51,7 @@ build-stamp: configure-stamp $(MAKE) - cp src/init-ceph debian/ceph-base.init + cp src/init-ceph debian/ceph-base.ceph.init cp src/init-radosgw debian/radosgw.init cp src/logrotate.conf debian/ceph.logrotate @@ -67,7 +67,7 @@ clean: ltmain.sh missing rm -f configure Makefile.in man/Makefile.in src/Makefile.in rm -f src/acconfig.h.in - rm -f debian/ceph-base.init debian/radosgw.init debian/ceph.logrotate debian/radosgw.logrotate + rm -f debian/ceph-base.ceph.init debian/radosgw.init debian/ceph.logrotate debian/radosgw.logrotate dh_clean @@ -117,7 +117,8 @@ binary-arch: build install dh_install -a --sourcedir=$(DESTDIR) --list-missing install -d -m0755 debian/ceph-base/etc/logrotate.d install -m0644 debian/ceph.logrotate debian/ceph-base/etc/logrotate.d - dh_installinit -a --no-start + dh_installinit -p ceph-base --name ceph --no-start + dh_installinit -p radosgw --no-start # dh_installinit is only set up to handle one upstart script # per package, so do this ourselves install -d -m0755 debian/ceph-base/etc/init |