From: Yi Zhao Date: Thu, 18 Oct 2018 08:05:44 +0000 (+0800) Subject: dhcp: use config file dhcpd6.conf in dhcpd6.service for DHCP IPv6 X-Git-Tag: uninative-2.3~20 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0772ed9acf96c53b05e6ac19e1af78bbb1192a3b;p=openembedded-core.git dhcp: use config file dhcpd6.conf in dhcpd6.service for DHCP IPv6 Use dhcpd6.conf for DHCP IPv6 and dhpcd.conf for DHCP IPv4. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd6.service b/meta/recipes-connectivity/dhcp/files/dhcpd6.service index ca96abb838..52a6224dc2 100644 --- a/meta/recipes-connectivity/dhcp/files/dhcpd6.service +++ b/meta/recipes-connectivity/dhcp/files/dhcpd6.service @@ -9,7 +9,7 @@ PIDFile=@localstatedir@/run/dhcpd6.pid EnvironmentFile=@SYSCONFDIR@/default/dhcp-server EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcpd6 ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd6.leases -ExecStart=@SBINDIR@/dhcpd -f -6 -cf @SYSCONFDIR@/dhcp/dhcpd.conf -pf @localstatedir@/run/dhcpd6.pid $DHCPDARGS -q $INTERFACES +ExecStart=@SBINDIR@/dhcpd -f -6 -cf @SYSCONFDIR@/dhcp/dhcpd6.conf -pf @localstatedir@/run/dhcpd6.pid $DHCPDARGS -q $INTERFACES [Install] WantedBy=multi-user.target