[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5b0eca95280d4eca42d54b007f4fd41c33a82152

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5b0eca95280d4eca42d54b007f4fd41c33a82152

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2167 bytes --]

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  5b0eca95280d4eca42d54b007f4fd41c33a82152 (commit)
      from  20e71c0eb029bf5e549dcd9970a64d0a53bf62bf (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 5b0eca95280d4eca42d54b007f4fd41c33a82152
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Feb 12 18:00:09 2022 +0000

    firewall: initialize IFACE if it is empty
    
    at first boot there is no IFACE set which result in iptables
    errors at boot.
    
    fixes #12767
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/system/firewall | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index f35b6b6e1..577c10c89 100644
--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -7,6 +7,9 @@ eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
 IFACE=`/bin/cat /var/ipfire/red/iface 2> /dev/null | /usr/bin/tr -d '\012'`
+if [ -z $IFACE]; then
+	IFACE="red0"
+fi
 
 if [ -f /var/ipfire/red/device ]; then
 	DEVICE=`/bin/cat /var/ipfire/red/device 2> /dev/null | /usr/bin/tr -d '\012'`
@@ -39,9 +42,6 @@ iptables_init() {
 	iptables -P FORWARD DROP
 	iptables -P OUTPUT ACCEPT
 
-	# Ensure the xt_geoip module is always loaded (#12767)
-	modprobe xt_geoip
-
 	# Enable TRACE logging to syslog
 	modprobe nf_log_ipv4
 	sysctl -q -w net.netfilter.nf_log.2=nf_log_ipv4


hooks/post-receive
--
IPFire 2.x development tree