aboutsummaryrefslogtreecommitdiffstats
path: root/meta-systemd
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-09-17 15:24:10 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-09-26 05:41:52 +0200
commit1956582b91afda4612f0e4c84ab59826a3e1a2c1 (patch)
treeed48919841d6ebfcd5688f3372b02936325a4a4e /meta-systemd
parent2b47bf3d60e92acca5cd012545c0ea5ffb7615c3 (diff)
downloadmeta-openembedded-contrib-1956582b91afda4612f0e4c84ab59826a3e1a2c1.tar.gz
dhcp: remove parts now merged into OE-Core recipe
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-systemd')
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service12
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service10
-rw-r--r--meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend17
3 files changed, 3 insertions, 36 deletions
diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service
deleted file mode 100644
index 70beee92e6a..00000000000
--- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/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-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service
deleted file mode 100644
index f68f468eef5..00000000000
--- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/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
diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
index 1dd6d58eb68..6c0fd026418 100644
--- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
@@ -1,16 +1,10 @@
# look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-inherit systemd
-
-SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client"
-SYSTEMD_SERVICE_dhcp-server = "dhcpd.service"
-SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service"
+SYSTEMD_PACKAGES += "dhcp-client"
SYSTEMD_SERVICE_dhcp-client = "dhclient.service"
SYSTEMD_AUTO_ENABLE_dhcp-client = "disable"
-FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service"
-FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service"
FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service"
RPROVIDES_dhcp-server += "dhcp-server-systemd"
RREPLACES_dhcp-server += "dhcp-server-systemd"
@@ -22,14 +16,9 @@ RPROVIDES_dhcp-client += "dhcp-client-systemd"
RREPLACES_dhcp-client += "dhcp-client-systemd"
RCONFLICTS_dhcp-client += "dhcp-client-systemd"
-SRC_URI += "file://dhcpd.service \
- file://dhclient.service \
- file://dhcrelay.service \
-"
+SRC_URI += "file://dhclient.service"
+
do_install_append() {
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
}