aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-06-10 21:46:48 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-07-16 09:39:06 +0200
commit1e6cf9483d41cf8033ada4fd15a07bb4d85aa724 (patch)
tree27ba96db0911cf7c9834b53c8982619402db83e7 /meta-oe/recipes-connectivity
parentca89a235067f3328ceaa3c7a0a5bb599aaa4b428 (diff)
downloadmeta-openembedded-1e6cf9483d41cf8033ada4fd15a07bb4d85aa724.tar.gz
dhcp: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend13
-rw-r--r--meta-oe/recipes-connectivity/dhcp/files/dhcpd.service12
-rw-r--r--meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service10
3 files changed, 0 insertions, 35 deletions
diff --git a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend b/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
deleted file mode 100644
index edd44c16d3..0000000000
--- a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-# look for files in the layer first
-FILESEXTRAPATHS := "${THISDIR}/files"
-
-inherit systemd
-
-PRINC := "${@int(PRINC) + 1}"
-
-SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd"
-SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service"
-SYSTEMD_SERVICE_dhcp-relay-systemd = "dhcrelay.service"
-
-SRC_URI += "file://dhcpd.service \
- file://dhcrelay.service"
diff --git a/meta-oe/recipes-connectivity/dhcp/files/dhcpd.service b/meta-oe/recipes-connectivity/dhcp/files/dhcpd.service
deleted file mode 100644
index 70beee92e6..0000000000
--- a/meta-oe/recipes-connectivity/dhcp/files/dhcpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Dynamic Host Configuration Protocol (DHCP)
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/dhcpd.pid
-EnvironmentFile=-/etc/default/dhcp-server
-ExecStart=/usr/sbin/dhcpd -cf /etc/dhcp/dhcpd.conf -q $INTERFACES
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service b/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
deleted file mode 100644
index f68f468eef..0000000000
--- a/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCP Relay Agent Daemon
-After=syslog.target network.target
-
-[Service]
-EnvironmentFile=/etc/default/dhcp-relay
-ExecStart=/usr/sbin/dhcrelay -d $DHCRELAYARGS
-
-[Install]
-WantedBy=multi-user.target