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

[Andres Rodriguez]

Fix systemd DHCPd units to correctly run in Vivid.

[lp:~andreserl/maas/fix_sytemd_units_dhcpd]

372. By Andres Rodriguez on 2015-04-01

Fix typo

[lp:~andreserl/maas/fix_sytemd_units_dhcpd]

373. By Andres Rodriguez on 2015-04-01

Fix comments

[Raphaël Badin (rvb)]

review: Approve

[Raphaël Badin (rvb)]

Please double check that it works before landing… it's so easy to break things with these scripts…

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-30 23:23:34 +0000
+++ debian/changelog	2015-04-01 11:41:38 +0000
@@ -3,6 +3,10 @@
   [ Mike Pontillo ]
   * debian/extras/maas-region-admin: Fix Path setting.
 
+  [ Andres Rodriguez ]
+  * debian/maas-dhcp.maas-dhcpd[6].service: Fix units to correctly run
+    in vivid.
+
  -- Andres Rodriguez <[e-mail]>  Mon, 30 Mar 2015 19:17:47 -0400
 
 maas (1.8.0~alpha9+bzr3750-0ubuntu1) trusty; urgency=medium

=== modified file 'debian/maas-dhcp.maas-dhcpd.service'
--- debian/maas-dhcp.maas-dhcpd.service	2015-03-10 20:56:06 +0000
+++ debian/maas-dhcp.maas-dhcpd.service	2015-04-01 11:41:38 +0000
@@ -8,16 +8,20 @@
 ConditionPathExists=/var/lib/maas/dhcpd-interfaces
 
 [Service]
+# Allow dhcp server to write lease and pid file as 'dhcpd' user
 ExecStartPre=/bin/mkdir -p /run/maas/dhcp
-# Allow dhcp server to write lease and pid file as 'dhcpd' user
-ExecStartPre=/bin/chown dhcpd:dhcpd /run/maas/dhcp
+ExecStartPre=/bin/chown root:root /run/maas/dhcp
 # The leases files need to be root:root even when dropping privileges
+ExecStartPre=/bin/mkdir -p /var/lib/maas/dhcp
+ExecStartPre=/bin/chown root:root /var/lib/maas/dhcp
+# Start the daemon
 ExecStart=/bin/sh -ec '\
-    CONFIG_FILE=/etc/maas/dhcpd.conf; \
-    INTERFACES_FILE=/var/lib/maas/dhcpd-interfaces; \
-    [ -e /var/lib/maas/dhcp/dhcpd.leases ] || touch /var/lib/maas/dhcp/dhcpd.leases; \
+    INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \
+    LEASES_FILE=/var/lib/maas/dhcp/dhcpd.leases; \
+    [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
     chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd.leases*; \
-    exec dhcpd -user dhcpd -group dhcpd -f -4 -pf /run/maas/dhcp/dhcpd.pid -cf $CONFIG_FILE $INTERFACES_FILE'
+    exec dhcpd -user dhcpd -group dhcpd -f -q -4 -pf /run/maas/dhcp/dhcpd.pid \ 
+        -cf /etc/maas/dhcpd.conf -lf $LEASES_FILE $INTERFACES'
 
 [Install]
 WantedBy=multi-user.target

=== modified file 'debian/maas-dhcp.maas-dhcpd6.service'
--- debian/maas-dhcp.maas-dhcpd6.service	2015-03-10 20:56:06 +0000
+++ debian/maas-dhcp.maas-dhcpd6.service	2015-04-01 11:41:38 +0000
@@ -8,16 +8,20 @@
 ConditionPathExists=/var/lib/maas/dhcpd-interfaces
 
 [Service]
+# Allow dhcp server to write lease and pid file as 'dhcpd' user
 ExecStartPre=/bin/mkdir -p /run/maas/dhcp
-# Allow dhcp server to write lease and pid file as 'dhcpd' user
-ExecStartPre=/bin/chown dhcpd:dhcpd /run/maas/dhcp
+ExecStartPre=/bin/chown root:root /run/maas/dhcp
 # The leases files need to be root:root even when dropping privileges
+ExecStartPre=/bin/mkdir -p /var/lib/maas/dhcp
+ExecStartPre=/bin/chown root:root /var/lib/maas/dhcp
+# Start the daemon
 ExecStart=/bin/sh -ec '\
-    CONFIG_FILE=/etc/maas/dhcpd6.conf; \
-    INTERFACES_FILE=/var/lib/maas/dhcpd-interfaces; \
-    [ -e /var/lib/maas/dhcp/dhcpd6.leases ] || touch /var/lib/maas/dhcp/dhcpd6.leases; \
+    INTERFACES=$(cat /var/lib/maas/dhcpd-interfaces); \
+    LEASES_FILE=/var/lib/maas/dhcp/dhcpd6.leases; \
+    [ -e $LEASES_FILE ] || touch $LEASES_FILE; \
     chown root:root /var/lib/maas/dhcp /var/lib/maas/dhcp/dhcpd6.leases*; \
-    exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid -cf $CONFIG_FILE $INTERFACES_FILE'
+    exec dhcpd -user dhcpd -group dhcpd -f -6 -pf /run/maas/dhcp/dhcpd6.pid \
+        -cf /etc/maas/dhcpd6.conf -lf $LEASES_FILE $INTERFACES'
 
 [Install]
 WantedBy=multi-user.target