[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3eefc5fc6d98b6a117284c30c8ef0b3f67440c52

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3eefc5fc6d98b6a117284c30c8ef0b3f67440c52

[Michael Tremer]

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  3eefc5fc6d98b6a117284c30c8ef0b3f67440c52 (commit)
       via  39172586ac8778d34392ef881dda3eca797239a4 (commit)
       via  81e867c96620ac5f000f68afa6b4cc36066f1a78 (commit)
      from  a9febdb8dd3547950f7581eb0ae0e619e0d2d21e (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 3eefc5fc6d98b6a117284c30c8ef0b3f67440c52
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jul 23 09:02:25 2025 +0000

    core197: Restart the firewall
    
    This is required so that all new OpenVPN chains are available.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 39172586ac8778d34392ef881dda3eca797239a4
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jul 23 09:00:09 2025 +0000

    openvpn: Silence when loading the tun module goes wrong
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 81e867c96620ac5f000f68afa6b4cc36066f1a78
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jul 23 08:58:43 2025 +0000

    core197: Escape slashes in path in sed command
    
    I think I have been too fast...
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/backup/backup.pl             | 2 +-
 config/rootfiles/core/197/update.sh | 3 ++-
 src/initscripts/system/openvpn-n2n  | 2 +-
 src/initscripts/system/openvpn-rw   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index a227be841..ed7a68455 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -354,7 +354,7 @@ restore_backup() {
 		-e "s/^writepid .*/writepid \/var\/run\/openvpn-rw.pid/" \
 		-e "/ncp-disable/d" \
 		-e "s/^cipher (.*)/data-ciphers-fallback \1/" \
-		-e "s/^status .*/status /var/run/openvpn-rw.log/" \
+		-e "s/^status .*/status \/var\/run\/openvpn-rw.log/" \
 		-i /var/ipfire/ovpn/server.conf
 
 	# Change to the subnet topology
diff --git a/config/rootfiles/core/197/update.sh b/config/rootfiles/core/197/update.sh
index 936e692a9..63250a826 100644
--- a/config/rootfiles/core/197/update.sh
+++ b/config/rootfiles/core/197/update.sh
@@ -125,7 +125,7 @@ sed -r \
 	-e "s/^writepid .*/writepid \/var\/run\/openvpn-rw.pid/" \
 	-e "/ncp-disable/d" \
 	-e "s/^cipher (.*)/data-ciphers-fallback \1/" \
-	-e "s/^status .*/status /var/run/openvpn-rw.log/" \
+	-e "s/^status .*/status \/var\/run\/openvpn-rw.log/" \
 	-i /var/ipfire/ovpn/server.conf
 
 # Change to the subnet topology
@@ -152,6 +152,7 @@ fi
 /usr/local/bin/sshctrl
 
 # Restart services
+/etc/init.d/firewall restart
 /etc/init.d/unbound restart
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
 	/etc/init.d/ipsec start
diff --git a/src/initscripts/system/openvpn-n2n b/src/initscripts/system/openvpn-n2n
index 4d55f4cbd..985398379 100644
--- a/src/initscripts/system/openvpn-n2n
+++ b/src/initscripts/system/openvpn-n2n
@@ -252,7 +252,7 @@ start() {
 	fi
 
 	# Load the tun module
-	modprobe tun
+	modprobe tun &>/dev/null
 
 	boot_mesg "Starting OpenVPN N2N connection '${name}'..."
 
diff --git a/src/initscripts/system/openvpn-rw b/src/initscripts/system/openvpn-rw
index 56a62d71c..6359d0d08 100644
--- a/src/initscripts/system/openvpn-rw
+++ b/src/initscripts/system/openvpn-rw
@@ -35,7 +35,7 @@ case "${1}" in
 		fi
 
 		# Load the tun module
-		modprobe tun
+		modprobe tun &>/dev/null
 
 		# Flush all firewall rules
 		iptables -F OVPNINPUTRW


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