~mpontillo/maas/packaging-python-apt-fix

[r=rvb][bug=][author=andreserl] Fix systemd DHCPd units to correctly run in Vivid.

added added

removed removed

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