summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorLi xin <lixin.fnst@cn.fujitsu.com>2015-06-18 10:14:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-08 00:01:19 +0100
commit44f0c01f31204b0c2d44876b3b20d126b8f49ea2 (patch)
tree2b1c8a7e54ee847e837b7170290b94c68c779991 /meta/recipes-connectivity
parentae5c24b20ae045841522f322d7e9dd2cc93a8022 (diff)
downloadpoky-44f0c01f31204b0c2d44876b3b20d126b8f49ea2.tar.gz
dhcp: modify dhcpd.service to make it start successfully and add systemd service files dhcpd6.service
(From OE-Core rev: b8eeac1b85c253c49f4324ac36db8ff98b286688) Signed-off-by: Li Xin <lixin.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.inc12
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhcpd.service8
-rw-r--r--meta/recipes-connectivity/dhcp/files/dhcpd6.service15
3 files changed, 29 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 6ced77500a..3bf1ea958d 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -17,12 +17,13 @@ SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
17 file://init-relay file://default-relay \ 17 file://init-relay file://default-relay \
18 file://init-server file://default-server \ 18 file://init-server file://default-server \
19 file://dhclient.conf file://dhcpd.conf \ 19 file://dhclient.conf file://dhcpd.conf \
20 file://dhcpd.service file://dhcrelay.service" 20 file://dhcpd.service file://dhcrelay.service \
21 file://dhcpd6.service "
21 22
22inherit autotools systemd 23inherit autotools systemd
23 24
24SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay" 25SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay"
25SYSTEMD_SERVICE_${PN}-server = "dhcpd.service" 26SYSTEMD_SERVICE_${PN}-server = "dhcpd.service dhcpd6.service"
26SYSTEMD_AUTO_ENABLE_${PN}-server = "disable" 27SYSTEMD_AUTO_ENABLE_${PN}-server = "disable"
27 28
28SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service" 29SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service"
@@ -59,9 +60,12 @@ do_install_append () {
59 # Install systemd unit files 60 # Install systemd unit files
60 install -d ${D}${systemd_unitdir}/system 61 install -d ${D}${systemd_unitdir}/system
61 install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system 62 install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
63 install -m 0644 ${WORKDIR}/dhcpd6.service ${D}${systemd_unitdir}/system
62 install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system 64 install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
63 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcpd.service ${D}${systemd_unitdir}/system/dhcrelay.service 65 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service ${D}${systemd_unitdir}/system/dhcrelay.service
64 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd.service 66 sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
67 sed -i -e 's,@base_bindir@,${base_bindir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
68 sed -i -e 's,@localstatedir@,${localstatedir},g' ${D}${systemd_unitdir}/system/dhcpd*.service
65} 69}
66 70
67PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" 71PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd.service b/meta/recipes-connectivity/dhcp/files/dhcpd.service
index 8648f1a253..ae4f93eca5 100644
--- a/meta/recipes-connectivity/dhcp/files/dhcpd.service
+++ b/meta/recipes-connectivity/dhcp/files/dhcpd.service
@@ -1,11 +1,15 @@
1[Unit] 1[Unit]
2Description=DHCP Server Daemon 2Description=DHCPv4 Server Daemon
3Documentation=man:dhcpd(8) man:dhcpd.conf(5)
3After=network.target 4After=network.target
4After=time-sync.target 5After=time-sync.target
5 6
6[Service] 7[Service]
8PIDFile=@localstatedir@/run/dhcpd.pid
7EnvironmentFile=@SYSCONFDIR@/default/dhcp-server 9EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
8ExecStart=-@SBINDIR@/dhcpd -q $INTERFACES 10EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcp-server
11ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd.leases
12ExecStart=@SBINDIR@/dhcpd -f -cf @SYSCONFDIR@/dhcp/dhcpd.conf -pf @localstatedir@/run/dhcpd.pid $DHCPDARGS -q $INTERFACES
9 13
10[Install] 14[Install]
11WantedBy=multi-user.target 15WantedBy=multi-user.target
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd6.service b/meta/recipes-connectivity/dhcp/files/dhcpd6.service
new file mode 100644
index 0000000000..ca96abb838
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/files/dhcpd6.service
@@ -0,0 +1,15 @@
1[Unit]
2Description=DHCPv6 Server Daemon
3Documentation=man:dhcpd(8) man:dhcpd.conf(5)
4After=network.target
5After=time-sync.target
6
7[Service]
8PIDFile=@localstatedir@/run/dhcpd6.pid
9EnvironmentFile=@SYSCONFDIR@/default/dhcp-server
10EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcpd6
11ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd6.leases
12ExecStart=@SBINDIR@/dhcpd -f -6 -cf @SYSCONFDIR@/dhcp/dhcpd.conf -pf @localstatedir@/run/dhcpd6.pid $DHCPDARGS -q $INTERFACES
13
14[Install]
15WantedBy=multi-user.target