Merge lp:~blake-rouse/maas/fix-1556354 into lp:~maas-maintainers/maas/packaging

Proposed by Blake Rouse on 2016-03-12
Status: Merged
Approved by: Blake Rouse on 2016-03-12
Approved revision: 458
Merged at revision: 458
Proposed branch: lp:~blake-rouse/maas/fix-1556354
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 29 lines (+8/-0)
2 files modified
debian/maas-dhcp.maas-dhcpd.service (+4/-0)
debian/maas-dhcp.maas-dhcpd6.service (+4/-0)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1556354
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) 2016-03-12 Approve on 2016-03-12
Review via email: mp+288851@code.launchpad.net

Commit message

Set KillMode=SIGKILL for maas-dhcpd and maas-dhcpd6.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
--- debian/maas-dhcp.maas-dhcpd.service 2016-02-16 20:10:08 +0000
+++ debian/maas-dhcp.maas-dhcpd.service 2016-03-12 03:04:33 +0000
@@ -9,6 +9,10 @@
9ConditionPathExists=/var/lib/maas/dhcpd-interfaces9ConditionPathExists=/var/lib/maas/dhcpd-interfaces
1010
11[Service]11[Service]
12# Kill the DHCP server with SIGKILL. Without this dhcpd can take a very long
13# time to stop, which prevents the quick reload of the dhcpd.conf that MAAS
14# requires.
15KillMode=SIGKILL
12# Allow dhcp server to write lease and pid file as 'dhcpd' user16# Allow dhcp server to write lease and pid file as 'dhcpd' user
13ExecStartPre=/bin/mkdir -p /run/maas/dhcp17ExecStartPre=/bin/mkdir -p /run/maas/dhcp
14ExecStartPre=/bin/chown root:root /run/maas/dhcp18ExecStartPre=/bin/chown root:root /run/maas/dhcp
1519
=== modified file 'debian/maas-dhcp.maas-dhcpd6.service'
--- debian/maas-dhcp.maas-dhcpd6.service 2016-02-16 20:10:08 +0000
+++ debian/maas-dhcp.maas-dhcpd6.service 2016-03-12 03:04:33 +0000
@@ -9,6 +9,10 @@
9ConditionPathExists=/var/lib/maas/dhcpd-interfaces9ConditionPathExists=/var/lib/maas/dhcpd-interfaces
1010
11[Service]11[Service]
12# Kill the DHCP server with SIGKILL. Without this dhcpd can take a very long
13# time to stop, which prevents the quick reload of the dhcpd6.conf that MAAS
14# requires.
15KillMode=SIGKILL
12# Allow dhcp server to write lease and pid file as 'dhcpd' user16# Allow dhcp server to write lease and pid file as 'dhcpd' user
13ExecStartPre=/bin/mkdir -p /run/maas/dhcp17ExecStartPre=/bin/mkdir -p /run/maas/dhcp
14ExecStartPre=/bin/chown root:root /run/maas/dhcp18ExecStartPre=/bin/chown root:root /run/maas/dhcp

Subscribers

People subscribed via source and target branches