build: execute dh_systemd_{enable,start} after dh_install

Ensure that dh_systemd_* debhelpers are executed after dh_install
has installed the systemd unit and target definitions.

This ensures that targets are enabled by default once installed,
resolving issues with startup of ceph daemons on server reboot.

Fixes: http://tracker.ceph.com/issues/19585
Signed-off-by: James Page <james.page@ubuntu.com>

diff --git a/debian/rules b/debian/rules
index d4b3c97f719c3f20121ceedd808bbb17a18a6aef..2e4ec9d22a33ecaa2f689604db0b212bc770fea7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -131,9 +131,16 @@ override_dh_installinit:
        dh_installinit -p ceph-base --name ceph --no-start
        dh_installinit -p radosgw --no-start
 
-override_dh_systemd_start:
+       # NOTE: execute systemd helpers so they pickup dh_install'ed units and targets
+       dh_systemd_enable
        dh_systemd_start --no-restart-on-upgrade
 
+override_dh_systemd_enable:
+       # systemd enable done as part of dh_installinit
+
+override_dh_systemd_start:
+       # systemd start done as part of dh_installinit
+
 override_dh_strip:
        dh_strip -pceph-mds --dbg-package=ceph-mds-dbg
        dh_strip -pceph-fuse --dbg-package=ceph-fuse-dbg