From f0ee1778c99a8b40c0fefa5f846aa34bf9701008 Mon Sep 17 00:00:00 2001 From: Dai Caiyun Date: Fri, 22 Apr 2016 12:18:31 +0300 Subject: dhcp: dhcrelay.service cannot start successfully Modify dhcrelay.service to avoid it start failed. Signed-off-by: Dai Caiyun Signed-off-by: Ross Burton --- meta/recipes-connectivity/dhcp/dhcp.inc | 1 + meta/recipes-connectivity/dhcp/files/dhcrelay.service | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc index 421221f388..aafdd0a13d 100644 --- a/meta/recipes-connectivity/dhcp/dhcp.inc +++ b/meta/recipes-connectivity/dhcp/dhcp.inc @@ -79,6 +79,7 @@ do_install_append () { sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd*.service sed -i -e 's,@base_bindir@,${base_bindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/dhcpd*.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service } PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" diff --git a/meta/recipes-connectivity/dhcp/files/dhcrelay.service b/meta/recipes-connectivity/dhcp/files/dhcrelay.service index a2d818917d..15ff927d34 100644 --- a/meta/recipes-connectivity/dhcp/files/dhcrelay.service +++ b/meta/recipes-connectivity/dhcp/files/dhcrelay.service @@ -3,7 +3,8 @@ Description=DHCP Relay Agent Daemon After=network.target [Service] -ExecStart=@SBINDIR@/dhcrelay -d --no-pid +EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay +ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS [Install] WantedBy=multi-user.target -- cgit 1.2.3-korg