Merge lp:~andreserl/maas/lp1456538 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

debian/rules: Ensure maas-regiond-worker is not started in packaging.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-22 12:08:34 +0000
+++ debian/changelog	2015-05-27 15:37:48 +0000
@@ -4,6 +4,9 @@
   * debian/extras/99-maas-sudoers: Allow maas to check the status of
     maas-dhcpd and maas-dhcp6 and start these services (LP: #1457708).
 
+  [ Andres Rodriguez ]
+  * debian/rules: Ensure maas-regiond-worker is not started in packaging.
+
  -- Andres Rodriguez <[e-mail]>  Thu, 21 May 2015 19:18:22 -0400
 
 maas (1.8.0~beta7+bzr3926-0ubuntu1) trusty; urgency=medium

=== modified file 'debian/rules'
--- debian/rules	2015-05-15 17:10:13 +0000
+++ debian/rules	2015-05-27 15:37:48 +0000
@@ -18,8 +18,8 @@
 	dh_installinit --name maas-regiond
 	dh_systemd_start --name maas-regiond
 	# maas-regiond-worker
-	dh_installinit --name maas-regiond-worker  # Upstart
-	dh_installinit --name maas-regiond-worker@  # systemd
+	dh_installinit --no-start --name maas-regiond-worker  # Upstart
+	dh_installinit --no-start --name maas-regiond-worker@  # systemd
 	# maas-dhcpd
 	dh_systemd_enable --name maas-dhcpd
 	dh_installinit --name maas-dhcpd