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
1=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
2--- debian/maas-dhcp.maas-dhcpd.service 2016-02-16 20:10:08 +0000
3+++ debian/maas-dhcp.maas-dhcpd.service 2016-03-12 03:04:33 +0000
4@@ -9,6 +9,10 @@
5 ConditionPathExists=/var/lib/maas/dhcpd-interfaces
6
7 [Service]
8+# Kill the DHCP server with SIGKILL. Without this dhcpd can take a very long
9+# time to stop, which prevents the quick reload of the dhcpd.conf that MAAS
10+# requires.
11+KillMode=SIGKILL
12 # Allow dhcp server to write lease and pid file as 'dhcpd' user
13 ExecStartPre=/bin/mkdir -p /run/maas/dhcp
14 ExecStartPre=/bin/chown root:root /run/maas/dhcp
15
16=== modified file 'debian/maas-dhcp.maas-dhcpd6.service'
17--- debian/maas-dhcp.maas-dhcpd6.service 2016-02-16 20:10:08 +0000
18+++ debian/maas-dhcp.maas-dhcpd6.service 2016-03-12 03:04:33 +0000
19@@ -9,6 +9,10 @@
20 ConditionPathExists=/var/lib/maas/dhcpd-interfaces
21
22 [Service]
23+# Kill the DHCP server with SIGKILL. Without this dhcpd can take a very long
24+# time to stop, which prevents the quick reload of the dhcpd6.conf that MAAS
25+# requires.
26+KillMode=SIGKILL
27 # Allow dhcp server to write lease and pid file as 'dhcpd' user
28 ExecStartPre=/bin/mkdir -p /run/maas/dhcp
29 ExecStartPre=/bin/chown root:root /run/maas/dhcp

Subscribers

People subscribed via source and target branches