diff options
| author |   Dai Caiyun <daicy.fnst@cn.fujitsu.com> | 2016-04-22 12:18:31 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-04 15:05:47 +0100 |
| commit | f0ee1778c99a8b40c0fefa5f846aa34bf9701008 (patch) | |
| tree | 2ba4e8144e391d64f2327eda79d1bfa3cfd4f567 | |
| parent | 5e5a6145d844c2f6daa3258429a870c42475adff (diff) | |
| download | openembedded-core-contrib-f0ee1778c99a8b40c0fefa5f846aa34bf9701008.tar.gz | |
dhcp: dhcrelay.service cannot start successfully
Modify dhcrelay.service to avoid it start failed.
Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhcrelay.service | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc index 421221f3881..aafdd0a13dd 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 a2d818917db..15ff927d346 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 |