MAAS

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

  1. fix-dhcpd-killsignal
  2. Merge into packaging
Proposed by Blake Rouse
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 459
Proposed branch: lp:~blake-rouse/maas/fix-dhcpd-killsignal
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 25 lines (+2/-2)
2 files modified
debian/maas-dhcp.maas-dhcpd.service (+1/-1)
debian/maas-dhcp.maas-dhcpd6.service (+1/-1)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-dhcpd-killsignal
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+289085@code.launchpad.net

Commit message

Set KillSignal not KillMode.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

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

Subscribers

People subscribed via source and target branches