From 1e6cf9483d41cf8033ada4fd15a07bb4d85aa724 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 10 Jun 2012 21:46:48 +0000 Subject: dhcp: move systemd support to meta-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend | 13 ------------- meta-oe/recipes-connectivity/dhcp/files/dhcpd.service | 12 ------------ meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service | 10 ---------- .../meta-oe/recipes-connectivity/dhcp/dhcp/dhcpd.service | 12 ++++++++++++ .../meta-oe/recipes-connectivity/dhcp/dhcp/dhcrelay.service | 10 ++++++++++ .../recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend | 13 +++++++++++++ 6 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend delete mode 100644 meta-oe/recipes-connectivity/dhcp/files/dhcpd.service delete mode 100644 meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service create mode 100644 meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcpd.service create mode 100644 meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcrelay.service create mode 100644 meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend 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 diff --git a/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcpd.service b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcpd.service new file mode 100644 index 0000000000..70beee92e6 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcpd.service @@ -0,0 +1,12 @@ +[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/meta-oe/recipes-connectivity/dhcp/dhcp/dhcrelay.service b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcrelay.service new file mode 100644 index 0000000000..f68f468eef --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcrelay.service @@ -0,0 +1,10 @@ +[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/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend new file mode 100644 index 0000000000..5fd7ccb601 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend @@ -0,0 +1,13 @@ +# look for files in the layer first +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +inherit systemd + +PRINC := "${@int(PRINC) + 2}" + +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" -- cgit v1.2.3-54-g00ecf