From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 20/29] dhcpcd.exe: Run everything no matter how RED is configured
Date: Thu, 01 Dec 2022 17:23:09 +0000 [thread overview]
Message-ID: <20221201172318.3166615-20-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20221201172318.3166615-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 1678 bytes --]
This could potentially create problems when we abuse these functions to
launch the DHCP client on IPTV interfaces. This would have to be tested
and confirmed or potentially we would need some more changes to keep
supporting that use-case, too.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
src/initscripts/networking/dhcpcd.exe | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe
index 440a76693..f6e494f96 100644
--- a/src/initscripts/networking/dhcpcd.exe
+++ b/src/initscripts/networking/dhcpcd.exe
@@ -34,7 +34,6 @@ dhcpcd_up()
exit 0;
fi
- # Only if RED_TYPE=DHCP update /var/ipfire/red
# Check if we have to restart the services at update
[ ! -e "/var/ipfire/red/active" ] && update=1;
if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then
@@ -82,13 +81,12 @@ dhcpcd_down()
# Remove DNS servers
rm -f /var/run/dns1 /var/run/dns2
- # Only if RED_TYPE=DHCP update /var/ipfire/red
- if [ "$RED_TYPE" == "DHCP" ]; then
- rm -f /var/ipfire/red/active
- if [ ! $reason == "PREINIT" ]; then
- logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down ($reason)"
- run_subdir ${rc_base}/init.d/networking/red.down/
- fi
+ # Consider RED to be no longer active
+ rm -f /var/ipfire/red/active
+
+ if [ ! $reason == "PREINIT" ]; then
+ logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down ($reason)"
+ run_subdir ${rc_base}/init.d/networking/red.down/
fi
# Remove any configured IP address from the device
--
2.30.2
next prev parent reply other threads:[~2022-12-01 17:23 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-01 17:22 [PATCH 01/29] libgudev: New package Michael Tremer
2022-12-01 17:22 ` [PATCH 02/29] libqmi: " Michael Tremer
2022-12-01 17:22 ` [PATCH 03/29] dhcpcd: Log any unhandled client events Michael Tremer
2022-12-01 17:22 ` [PATCH 04/29] dhcpcd.exe: Allow using the DHCP setup scripts when RED is not configured as DHCP Michael Tremer
2022-12-01 17:22 ` [PATCH 05/29] network: Allow passing custom options to dhcpcd Michael Tremer
2022-12-01 17:22 ` [PATCH 06/29] network: Add support for QMI modems Michael Tremer
2022-12-01 17:22 ` [PATCH 07/29] network: Drop any traces of ISDN Michael Tremer
2022-12-01 17:22 ` [PATCH 08/29] pppsetup.cgi: Add support for QMI profiles Michael Tremer
2022-12-01 17:22 ` [PATCH 09/29] " Michael Tremer
2022-12-01 17:22 ` [PATCH 10/29] pppsetup.cgi: Move authentication above MTU Michael Tremer
2022-12-01 17:23 ` [PATCH 11/29] network: Remove --debug switch for dhcpcd in QMI mode Michael Tremer
2022-12-01 17:23 ` [PATCH 12/29] dhcpcd: Only try to obtain an IP address for IPv4 Michael Tremer
2022-12-01 17:23 ` [PATCH 13/29] dhcpcd.exe: Flush any configured IP addresses on shutdown Michael Tremer
2022-12-01 17:23 ` [PATCH 14/29] dhcpcd.exe: Actually use the received MTU Michael Tremer
2022-12-01 17:23 ` [PATCH 15/29] dhcpcd.exe: Only set gateway when we have received one Michael Tremer
2022-12-01 17:23 ` [PATCH 16/29] dhcpcd.exe: Store the default gateway when in QMI mode Michael Tremer
2022-12-01 17:23 ` [PATCH 17/29] dhcpcd.exe: Use DNS servers from QMI Michael Tremer
2022-12-01 17:23 ` [PATCH 18/29] dhcpcd.exe: Do not overwrite the default gateway when empty Michael Tremer
2022-12-01 17:23 ` [PATCH 19/29] dhcpcd.exe: Only touch /var/ipfire/red/active once Michael Tremer
2022-12-01 17:23 ` Michael Tremer [this message]
2022-12-01 17:23 ` [PATCH 21/29] dhcpcd.exe: Fix typo in configuring DNS server Michael Tremer
2022-12-01 17:23 ` [PATCH 22/29] network: dhcpcd fails to check link state for QMI interfaces Michael Tremer
2022-12-01 17:23 ` [PATCH 23/29] dhcpcd.exe: Reformat the reason dispatcher Michael Tremer
2022-12-01 17:23 ` [PATCH 24/29] dhcpcd.exe: Ignore some events Michael Tremer
2022-12-01 17:23 ` [PATCH 25/29] dhcpcd.exe: Add a safety net to make sure we always have a route Michael Tremer
2022-12-01 17:23 ` [PATCH 26/29] network: Force dhcpcd to ask for an IP address Michael Tremer
2022-12-01 17:23 ` [PATCH 27/29] network: Assign "static" MAC addresses to QMI interfaces Michael Tremer
2022-12-01 17:23 ` [PATCH 28/29] network: Silence any output during the QMI setup Michael Tremer
2022-12-01 17:23 ` [PATCH 29/29] make.sh: Build some dependencies for glib earlier Michael Tremer
2022-12-17 21:03 ` Peter Müller
2022-12-19 12:49 ` Michael Tremer
2022-12-20 12:03 ` Peter Müller
2022-12-20 16:07 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221201172318.3166615-20-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox