From a7607ac5a6130f604907d3fb4e952ed928b68f0d Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Wed, 12 Mar 2025 12:47:46 +0200
Subject: [PATCH] Switch from Systemd to Enit

---
 pkg.info                |  3 ++-
 source-files/dhcpcd     | 10 ----------
 source-files/dhcpcd.esv |  7 +++++++
 source-files/dhcpcdat   | 15 ---------------
 source.sh               |  7 +++----
 5 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 source-files/dhcpcd
 create mode 100644 source-files/dhcpcd.esv
 delete mode 100644 source-files/dhcpcdat

diff --git a/pkg.info b/pkg.info
index f8b7d03..6e3484b 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,8 +1,9 @@
 name: dhcpcd
 description: A DHCP and DHCPv6 client
 version: 10.0.6
+revision: 3
 url: https://roy.marples.name/projects/dhcpcd
 license: BSD-2-Clause
 architecture: any
-depends: ["glibc","openssl","systemd"]
+depends: ["glibc","openssl","udev"]
 type: source
diff --git a/source-files/dhcpcd b/source-files/dhcpcd
deleted file mode 100644
index 5f2a6b5..0000000
--- a/source-files/dhcpcd
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCP/ IPv4LL/ IPv6RA/ DHCPv6 client on all interfaces
-Wants=network.target
-Before=network.target
-
-[Service]
-ExecStart=/sbin/dhcpcd -q -B
-
-[Install]
-WantedBy=multi-user.target
diff --git a/source-files/dhcpcd.esv b/source-files/dhcpcd.esv
new file mode 100644
index 0000000..c7b7e5e
--- /dev/null
+++ b/source-files/dhcpcd.esv
@@ -0,0 +1,7 @@
+name: dhcpcd
+description: run dhcpcd on all clients
+dependencies: ["udevd"]
+type: background
+start_cmd: dhcpcd -q -B
+exit_method: kill
+restart: true
diff --git a/source-files/dhcpcdat b/source-files/dhcpcdat
deleted file mode 100644
index 5b2de7d..0000000
--- a/source-files/dhcpcdat
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=dhcpcd on %I
-Wants=network.target
-Before=network.target
-BindsTo=sys-subsystem-net-devices-%i.device
-After=sys-subsystem-net-devices-%i.device
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd/%I.pid
-ExecStart=/sbin/dhcpcd -q -w %I
-ExecStop=/sbin/dhcpcd -x %I
-
-[Install]
-WantedBy=multi-user.target
diff --git a/source.sh b/source.sh
index 0a9aa7a..07edae5 100644
--- a/source.sh
+++ b/source.sh
@@ -20,7 +20,7 @@ build() {
               --libexecdir=/usr/lib/dhcpcd \
               --dbdir=/var/lib/dhcpcd      \
               --runstatedir=/run           \
-              --disable-privsep            \
+              --disable-privsep
   make
 }
 
@@ -34,7 +34,6 @@ check() {
 # This function is used to move the compiled files into the output directory
 package() {
   make DESTDIR="$BPM_OUTPUT" install
-  mkdir -p "$BPM_OUTPUT"/usr/lib/systemd/system
-  install -m 644 ../dhcpcdat "$BPM_OUTPUT"/usr/lib/systemd/system/dhcpcd@.service
-  install -m 644 ../dhcpcd "$BPM_OUTPUT"/usr/lib/systemd/system/dhcpcd.service
+  mkdir -p "$BPM_OUTPUT"/etc/esvm/services/
+  install -m 644 ../dhcpcd.esv "$BPM_OUTPUT"/etc/esvm/services/dhcpcd.esv
 }