From 98d5ba81be3b2eafa3865e727b058d3bce11e806 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Sun, 24 Mar 2019 18:14:07 +0100
Subject: dhcpcd: wait for master socket

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 .gitignore             |  1 +
 configure.ac           |  1 +
 services/Makemodule.am |  2 +-
 services/dhcpcd        |  7 -------
 services/dhcpcd.in     | 10 ++++++++++
 5 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 100644 services/dhcpcd
 create mode 100644 services/dhcpcd.in

diff --git a/.gitignore b/.gitignore
index 2876249..fae2bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ services/swclocksave
 services/sysfs
 services/mountusr
 services/tmpfsvar
+services/dhcpcd
 crontab/swclock
 etc/40-ntpsetdate
 .#*
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index e2aef74..b784bec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AC_CONFIG_FILES([services/sshd])
 AC_CONFIG_FILES([services/sshd_keygen])
 AC_CONFIG_FILES([services/mountusr])
 AC_CONFIG_FILES([services/tmpfsvar])
+AC_CONFIG_FILES([services/dhcpcd])
 AC_CONFIG_FILES([scripts/devfs.sh])
 AC_CONFIG_FILES([scripts/ifrename.sh])
 AC_CONFIG_FILES([scripts/ifcfg.sh])
diff --git a/services/Makemodule.am b/services/Makemodule.am
index 3baf46f..8bd2bb1 100644
--- a/services/Makemodule.am
+++ b/services/Makemodule.am
@@ -21,7 +21,7 @@ endif
 EXTRA_DIST += services/sysinit services/vfs services/agetty services/hostname
 EXTRA_DIST += services/hwclock services/loopback services/klogd
 EXTRA_DIST += services/sync services/sysctl services/tmpfs
-EXTRA_DIST += services/dhcpcd services/dhcpcdmaster services/unbound
+EXTRA_DIST += services/dhcpcdmaster services/unbound
 EXTRA_DIST += services/usyslogd services/dnsmasq services/network
 EXTRA_DIST += services/consolefont services/gcrond services/nginx
 EXTRA_DIST += services/tmpfsrun
diff --git a/services/dhcpcd b/services/dhcpcd
deleted file mode 100644
index 184a843..0000000
--- a/services/dhcpcd
+++ /dev/null
@@ -1,7 +0,0 @@
-description "DHCP client on %0"
-type once
-target boot
-after dhcpcdmaster network
-
-tty /dev/null
-exec dhcpcd -n %0
diff --git a/services/dhcpcd.in b/services/dhcpcd.in
new file mode 100644
index 0000000..0d83093
--- /dev/null
+++ b/services/dhcpcd.in
@@ -0,0 +1,10 @@
+description "DHCP client on %0"
+type once
+target boot
+after dhcpcdmaster network
+
+tty /dev/null
+exec {
+	"@SCRIPTDIR@/waitfile" 5 200 /run/dhcpcd.sock /run/dhcpcd.pid
+	dhcpcd -n %0
+}
-- 
cgit v1.2.3