diff --git a/dhcp.spec b/dhcp.spec index 9c2b7b4..8217a42 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -2,7 +2,7 @@ %define releasever %(echo %version | cut -d. -f1-3) Name: dhcp Version: 4.3.1 -Release: 2mamba +Release: 3mamba Summary: The ISC DHCP (Dynamic Host Configuration Protocol) client Group: System/Servers Vendor: openmamba @@ -208,6 +208,9 @@ grep "^send host-name" %{_sysconfdir}/dhclient.conf >/dev/null || { %doc RELNOTES doc %changelog +* Mon Jan 19 2015 Silvan Calarco 4.3.1-3mamba +- fix systemd service file (wrong pid reference) + * Tue Dec 23 2014 Silvan Calarco 4.3.1-2mamba - dhclient.conf: use gethostname() as default send hostname - server: remove initscript; add systemd service file diff --git a/dhcpd-sysconfig b/dhcpd-sysconfig index b3365ee..b9c8269 100644 --- a/dhcpd-sysconfig +++ b/dhcpd-sysconfig @@ -1,3 +1,2 @@ # Command line options here -#DHCPDIFS="eth0" DHCPDARGS= diff --git a/dhcpd@.service b/dhcpd@.service index 2fc523d..79d90df 100644 --- a/dhcpd@.service +++ b/dhcpd@.service @@ -6,8 +6,8 @@ After=network.target [Service] EnvironmentFile=-/etc/sysconfig/dhcpd Type=forking -PIDFile=/run/dhcpd.pid -ExecStart=/sbin/dhcpd -q -pf /run/dhcpd4.pid %I $DHCPDARGS +PIDFile=/run/dhcpd-%I.pid +ExecStart=/sbin/dhcpd -q -pf /run/dhcpd-%I.pid %I $DHCPDARGS KillSignal=SIGINT [Install]