From: Arne Fitzenreiter Date: Wed, 10 Mar 2021 13:29:54 +0000 (+0100) Subject: initskripts: networking: fix dhcpcd shutdown X-Git-Tag: v2.27-core159~165 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66acb7f16695b434fff144f63218ef76fd040ed1;p=ipfire-2.x.git 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 --- diff --git a/config/rootfiles/core/kerneltest/filelists/files b/config/rootfiles/core/kerneltest/filelists/files index e7e725ea61..4a06318cbd 100644 --- 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 b7ce1c5e0d..656e6a7abe 100644 --- 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