summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorDai Caiyun <daicy.fnst@cn.fujitsu.com>2016-04-22 12:18:31 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-04 15:22:22 +0100
commitd2e5c93dba516b85a10e510e65aaad5d77aaa652 (patch)
treecf3d2b3189c80d902ffcfebe1d737d6a08b9b3fe /meta/recipes-connectivity
parent43a39336243464e73db64cc66d29bb3d14663e7e (diff)
downloadpoky-d2e5c93dba516b85a10e510e65aaad5d77aaa652.tar.gz
dhcp: dhcrelay.service cannot start successfully
Modify dhcrelay.service to avoid it start failed. (From OE-Core rev: f0ee1778c99a8b40c0fefa5f846aa34bf9701008) Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp.inc1
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhcrelay.service3
2 files changed, 3 insertions, 1 deletions
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 () {
79 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd*.service 79 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
80 sed -i -e 's,@base_bindir@,${base_bindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service 80 sed -i -e 's,@base_bindir@,${base_bindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
81 sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/dhcpd*.service 81 sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
82 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcrelay.service
82} 83}
83 84
84PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" 85PACKAGES += "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
3After=network.target 3After=network.target
4 4
5[Service] 5[Service]
6ExecStart=@SBINDIR@/dhcrelay -d --no-pid 6EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay
7ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS
7 8
8[Install] 9[Install]
9WantedBy=multi-user.target 10WantedBy=multi-user.target