From: Dan Mick Date: Fri, 1 Apr 2016 03:30:00 +0000 (-0700) Subject: debian/rules: put init-ceph in /etc/init.d/ceph, not ceph-base X-Git-Tag: v10.1.1~25^2^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8406%2Fhead;p=ceph.git 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 --- diff --git a/debian/rules b/debian/rules index 91fa8b6acc8b..cb6836ad77f4 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