summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorJames Page <james.page@ubuntu.com>2017-07-07 18:18:27 +0200
committerJames Page <james.page@ubuntu.com>2017-07-07 18:18:27 +0200
commit8d0ebe217c86be5ff958d42e3aeb4b15a273a781 (patch)
treef1ec402bbdee7800875f2c5d118c8561ae517189 /debian
parentMerge pull request #16148 from liewegas/wip-20434 (diff)
downloadceph-8d0ebe217c86be5ff958d42e3aeb4b15a273a781.tar.xz
ceph-8d0ebe217c86be5ff958d42e3aeb4b15a273a781.zip
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>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/rules9
1 files changed, 8 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules
index d4b3c97f719..2e4ec9d22a3 100755
--- 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