From 98d5ba81be3b2eafa3865e727b058d3bce11e806 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 24 Mar 2019 18:14:07 +0100 Subject: [PATCH] dhcpcd: wait for master socket Signed-off-by: David Oberhollenzer --- .gitignore | 1 + configure.ac | 1 + services/Makemodule.am | 2 +- services/{dhcpcd => dhcpcd.in} | 5 ++++- 4 files changed, 7 insertions(+), 2 deletions(-) rename services/{dhcpcd => dhcpcd.in} (52%) 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.in similarity index 52% rename from services/dhcpcd rename to services/dhcpcd.in index 184a843..0d83093 100644 --- a/services/dhcpcd +++ b/services/dhcpcd.in @@ -4,4 +4,7 @@ target boot after dhcpcdmaster network tty /dev/null -exec dhcpcd -n %0 +exec { + "@SCRIPTDIR@/waitfile" 5 200 /run/dhcpcd.sock /run/dhcpcd.pid + dhcpcd -n %0 +}