[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1698/8267] dhcp: dhcrelay.service cannot start successfully

[Emmanuele Bassi <ebassi src gnome org>]

commit d2e5c93dba516b85a10e510e65aaad5d77aaa652
Author: Dai Caiyun <daicy fnst cn fujitsu com>
Date:   Fri Apr 22 12:18:31 2016 +0300

    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>

 meta/recipes-connectivity/dhcp/dhcp.inc            |    1 +
 .../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 421221f..aafdd0a 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 a2d8189..15ff927 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