From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 455291f90e0729ad8a8edc743d4375f782728ad3 Date: Sun, 01 Dec 2019 13:44:23 +0000 Message-ID: <47QqGv5vH9z2y1Z@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4707665109978045283==" List-Id: --===============4707665109978045283== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 455291f90e0729ad8a8edc743d4375f782728ad3 (commit) from 86409ab1006bd3582d55f59c399385b2c70434e2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 455291f90e0729ad8a8edc743d4375f782728ad3 Author: Arne Fitzenreiter Date: Sun Dec 1 14:03:46 2019 +0100 70-dhcpdd.exe: don't run red.down scripts at "PREINIT" =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/139/filelists/files | 1 + src/initscripts/networking/dhcpcd.exe | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/cor= e/139/filelists/files index 3ab3eece1..a08d12e20 100644 --- a/config/rootfiles/core/139/filelists/files +++ b/config/rootfiles/core/139/filelists/files @@ -5,6 +5,7 @@ var/ipfire/langs etc/httpd/conf/vhosts.d/ipfire-interface.conf etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/rc.d/init.d/functions +etc/rc.d/init.d/networking/dhcpcd.exe etc/rc.d/init.d/networking/red etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/red.up/23-suricata diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networki= ng/dhcpcd.exe index a2cdc66d2..5b1c5ab16 100644 --- a/src/initscripts/networking/dhcpcd.exe +++ b/src/initscripts/networking/dhcpcd.exe @@ -78,9 +78,11 @@ dhcpcd_down() =20 # Only if RED_TYPE=3DDHCP update /var/ipfire/red if [ "$RED_TYPE" =3D=3D "DHCP" ]; then - logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought dow= n" rm -f /var/ipfire/red/active - run_subdir ${rc_base}/init.d/networking/red.down/ + if [ ! $reason =3D=3D "PREINIT" ]; then + logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought do= wn" + run_subdir ${rc_base}/init.d/networking/red.down/ + fi fi } =20 hooks/post-receive -- IPFire 2.x development tree --===============4707665109978045283==--