[Pkg-ceph-commits] [ceph] 02/06: Ensure that systemd targets are enabled and started

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/yakkety
in repository ceph.

commit bcc64f4e058ba1c4309d80aaa7e6c0c89ac89449
Author: James Page <james.page at ubuntu.com>
Date:   Sat Jan 14 10:15:45 2017 +0200

    Ensure that systemd targets are enabled and started
    
    ceph upstream differs in systemd usage from the original systemd
    integration written in Debian; ensure that installed targets are
    enabled and started, excluding the systemd service units that
    are specific to Debian and Ubuntu.
    
    (cherry picked from commit c4e52fa4a768d3de5f579b38b9e3c2f81cb142e6)
---
 debian/rules | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8b3d4b6..481fb4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,18 +121,17 @@ override_dh_installinit:
 	install -m0644 systemd/ceph-rbd-mirror at .service debian/rbd-mirror/lib/systemd/system
 	sed -i s./etc/sysconfig/./etc/default/.g debian/rbd-mirror/lib/systemd/system/ceph-rbd-mirror at .service
 	install -m0644 systemd/ceph-rbd-mirror.target debian/rbd-mirror/lib/systemd/system
+	# Ensure Debian/Ubuntu specific systemd units are NOT automatically enabled and started
+	# Enable systemd targets only
+	dh_systemd_enable -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
+	# Start systemd targets only
+	dh_systemd_start --no-restart-on-upgrade -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
 
 override_dh_systemd_enable:
-	## Do not enable services to match `dh_installinit --no-start`
-	## behaviour.
-	## Users are expected to "systemctl enable" services once their
-	## configuration is correct.
+	# systemd enable done as part of dh_installinit
 
 override_dh_systemd_start:
-	## Do not start services to match `dh_installinit --no-start`
-	## behaviour.
-	## Users are expected to "systemctl start" services once their
-	## configuration is correct or after package updates.
+	# systemd start done as part of dh_installinit
 
 override_dh_makeshlibs:
 	# exclude jni libraries in libcephfs-jni to avoid pointless ldconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git