diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2014-09-03 15:09:07 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-03 10:24:21 +0100 |
| commit | 5f40081b0b9867bc167057712b04b3c1afb8a20d (patch) | |
| tree | ada232b4bb2363c9f27bf87d3349d4bc42cd6d3c /meta/recipes-connectivity | |
| parent | 90bb8e8f9bc2454590d230b209fc749ea7270b9e (diff) | |
| download | openembedded-core-5f40081b0b9867bc167057712b04b3c1afb8a20d.tar.gz openembedded-core-5f40081b0b9867bc167057712b04b3c1afb8a20d.tar.bz2 openembedded-core-5f40081b0b9867bc167057712b04b3c1afb8a20d.zip | |
dhcp: add systemd service files
Add dhcpd.service and dhcrelay.service to support systemd systems.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp.inc | 23 | ||||
| -rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhcpd.service | 11 | ||||
| -rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhcrelay.service | 9 |
3 files changed, 39 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc index 512127cd4c..a1752548be 100644 --- a/meta/recipes-connectivity/dhcp/dhcp.inc +++ b/meta/recipes-connectivity/dhcp/dhcp.inc @@ -14,11 +14,19 @@ DEPENDS = "openssl bind" SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ file://site.h \ - file://init-relay file://default-relay \ - file://init-server file://default-server \ - file://dhclient.conf file://dhcpd.conf" + file://init-relay file://default-relay \ + file://init-server file://default-server \ + file://dhclient.conf file://dhcpd.conf \ + file://dhcpd.service file://dhcrelay.service" -inherit autotools +inherit autotools systemd + +SYSTEMD_PACKAGES = "dhcp-server dhcp-relay" +SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" +SYSTEMD_AUTO_ENABLE_dhcp-server = "disable" + +SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" +SYSTEMD_AUTO_ENABLE_dhcp-relay = "disable" TARGET_CFLAGS += "-D_GNU_SOURCE" EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ @@ -51,6 +59,13 @@ do_install_append () { mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/ fi install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script + + # Install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcpd.service ${D}${systemd_unitdir}/system/dhcrelay.service + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd.service } PACKAGES += "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 new file mode 100644 index 0000000000..8648f1a253 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/files/dhcpd.service @@ -0,0 +1,11 @@ +[Unit] +Description=DHCP Server Daemon +After=network.target +After=time-sync.target + +[Service] +EnvironmentFile=@SYSCONFDIR@/default/dhcp-server +ExecStart=-@SBINDIR@/dhcpd -q $INTERFACES + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-connectivity/dhcp/files/dhcrelay.service b/meta/recipes-connectivity/dhcp/files/dhcrelay.service new file mode 100644 index 0000000000..a2d818917d --- /dev/null +++ b/meta/recipes-connectivity/dhcp/files/dhcrelay.service @@ -0,0 +1,9 @@ +[Unit] +Description=DHCP Relay Agent Daemon +After=network.target + +[Service] +ExecStart=@SBINDIR@/dhcrelay -d --no-pid + +[Install] +WantedBy=multi-user.target |