Julian Edwards has proposed merging lp:~julian-edwards/maas/stop-dhcp-bug-1059459 into lp:~maas-maintainers/maas/packaging.
Commit message: Ensure that the ISC DHCP server is stopped and disabled when installing maas-dhcp. Requested reviews: Launchpad code reviewers (launchpad-reviewers) Related bugs: Bug #1059459 in MAAS: "Existing DHCP server not stopped" https://bugs.launchpad.net/maas/+bug/1059459 For more details, see: https://code.launchpad.net/~julian-edwards/maas/stop-dhcp-bug-1059459/+merge/127418 This packaging change ensures that the ISC DHCP server is stopped and disabled when installing maas-dhcp. Pre-imped with Andres and QAed locally. -- https://code.launchpad.net/~julian-edwards/maas/stop-dhcp-bug-1059459/+merge/127418 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/stop-dhcp-bug-1059459 into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog' --- debian/changelog 2012-10-01 07:15:35 +0000 +++ debian/changelog 2012-10-02 05:50:23 +0000 @@ -1,7 +1,22 @@ -maas (0.1+bzr1116+dfsg-0ubuntu1) quantal; urgency=low +maas (0.1+bzr1122+dfsg-0ubuntu1) UNRELEASED; urgency=low * New upstream release. + [ Julian Edwards ] + * Ensure isc-dhcp-server is disabled when installing maas-dhcp. + + [ Raphaël Badin ] + * Split celery config into cluster and region configs. + * Add region celeryd upstart config. + * Define CELERY_CONFIG_MODULE in + maas-cluster-controller.maas-cluster-celery.upstart + + [ Jeroen Vermeulen ] + * Make maas_local_celery_config.py non-world readable. + * Make maas_local_celeryconfig_cluster.py non-world readable. + * Set root:maas ownership of local cluster config only *after* + the maas user/group have been created + -- Julian Edwards <[email protected]> Mon, 01 Oct 2012 17:13:57 +1000 maas (0.1+bzr1110+dfsg-0ubuntu1) quantal; urgency=low === added file 'debian/extras/isc-dhcp-server.override' --- debian/extras/isc-dhcp-server.override 1970-01-01 00:00:00 +0000 +++ debian/extras/isc-dhcp-server.override 2012-10-02 05:50:23 +0000 @@ -0,0 +1,1 @@ +manual === modified file 'debian/maas-cluster-controller.install' --- debian/maas-cluster-controller.install 2012-09-29 17:21:10 +0000 +++ debian/maas-cluster-controller.install 2012-10-02 05:50:23 +0000 @@ -16,3 +16,4 @@ # Install all other stuff debian/extras/99-maas-sudoers etc/sudoers.d debian/extras/maas-provision usr/sbin +debian/extras/isc-dhcp-server.override etc/init === modified file 'debian/maas-dhcp.postinst' --- debian/maas-dhcp.postinst 2012-09-27 05:23:12 +0000 +++ debian/maas-dhcp.postinst 2012-10-02 05:50:23 +0000 @@ -3,7 +3,14 @@ . /usr/share/debconf/confmodule db_version 2.0 +stop_isc_dhcp_server(){ + service isc_dhcp_server stop +} + + if [ "$1" = "configure" ]; then + stop_isc_dhcp_server + dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd" if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1; then
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
