initskripts: networking: fix dhcpcd shutdown

with kernel 5.10 dhcpcd hung at shutdown if red was a wireless client
becuase there was two running instances. This change repeat the
dcpcd -k call.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/kerneltest/filelists/files b/config/rootfiles/core/kerneltest/filelists/files
index e7e725ea61b3e287d2abe7b7c94d69a51a03a3cb..4a06318cbdbe3b710fba24303e78829eb4726f34 100644 (file)
--- a/config/rootfiles/core/kerneltest/filelists/files
+++ b/config/rootfiles/core/kerneltest/filelists/files
@@ -1,2 +1,3 @@
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/leds
+etc/rc.d/init.d/networking/functions.network

diff --git a/src/initscripts/networking/functions.network b/src/initscripts/networking/functions.network
index b7ce1c5e0d58b78f7e749f2a588b5a50c8f9ef0b..656e6a7abe55a0ef29430d822e4dbf4239a89e55 100644 (file)
--- a/src/initscripts/networking/functions.network
+++ b/src/initscripts/networking/functions.network
@@ -138,6 +138,8 @@ dhcpcd_stop() {
        # Wait until dhcpd has stopped.
        while [ -d "/proc/${pid}" ]; do
                sleep 1
+               # repeat stop if dhcp was still running
+               /sbin/dhcpcd ${dhcp_stop} ${device} &> /dev/null
        done
 
        # Display console message, depended on the exit code