summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-02-16 02:03:15 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-02-23 16:46:32 +0100
commit2cf07dd7d0ca3f5c85e44716da866d89f1cceade (patch)
treefa925e87ed8fac2cccf37c907a367ed5decfbd6f
parent3a5e1a0d86b8fc8d1898e69b07e51a5f64f5e2c3 (diff)
downloadmeta-openembedded-2cf07dd7d0ca3f5c85e44716da866d89f1cceade.tar.gz
dhcp: add native systemd support for dhcp-relay
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend8
-rw-r--r--meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service10
2 files changed, 15 insertions, 3 deletions
diff --git a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
index 829ad3cfc5..6d1e3dfb9c 100644
--- a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
+++ b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.0.bbappend
@@ -3,9 +3,11 @@ FILESEXTRAPATHS := "${THISDIR}/files"
3 3
4inherit systemd 4inherit systemd
5 5
6PRINC := "${@int(PRINC) + 2}" 6PRINC := "${@int(PRINC) + 3}"
7 7
8SYSTEMD_PACKAGES = "dhcp-server-systemd" 8SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd"
9SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service" 9SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service"
10SYSTEMD_SERVICE_dhcp-relay-systemd = "dhcrelay.service"
10 11
11SRC_URI += "file://dhcpd.service" 12SRC_URI += "file://dhcpd.service \
13 file://dhcrelay.service"
diff --git a/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service b/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
new file mode 100644
index 0000000000..f68f468eef
--- /dev/null
+++ b/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
@@ -0,0 +1,10 @@
1[Unit]
2Description=DHCP Relay Agent Daemon
3After=syslog.target network.target
4
5[Service]
6EnvironmentFile=/etc/default/dhcp-relay
7ExecStart=/usr/sbin/dhcrelay -d $DHCRELAYARGS
8
9[Install]
10WantedBy=multi-user.target