From: Chen Qi <Qi.Chen@windriver.com>
Date: Thu, 18 Sep 2014 05:47:43 +0000 (+0800)
Subject: dhcp: fix for systemd service file
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2FChenQi%2Fsystemd-dhcpd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

dhcp: fix for systemd service file

1. Set Type=forking for dhcpd.service to make it start up correctly.
2. Add PIDFile=/var/run/dhcpd.pid
3. Do not force existence of the environment file.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---

diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd.service b/meta/recipes-connectivity/dhcp/files/dhcpd.service
index 8648f1a2538..421517312dd 100644
--- a/meta/recipes-connectivity/dhcp/files/dhcpd.service
+++ b/meta/recipes-connectivity/dhcp/files/dhcpd.service
@@ -4,7 +4,9 @@ After=network.target
 After=time-sync.target
 
 [Service]
-EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
+Type=forking
+PIDFile=/var/run/dhcpd.pid
+EnvironmentFile=-@SYSCONFDIR@/default/dhcp-server
 ExecStart=-@SBINDIR@/dhcpd -q $INTERFACES
 
 [Install]