[PATCH 1/9] ipsec-interfaces: Don't throw away errors when creating routes

[PATCH 1/9] ipsec-interfaces: Don't throw away errors when creating routes

[Michael Tremer]

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

This partly reverts 87a97a431915849cf6d19e1b7137b4fb0b6dd91d.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/scripts/ipsec-interfaces | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces
index 974d3ac84..b05b2009c 100644
--- a/src/scripts/ipsec-interfaces
+++ b/src/scripts/ipsec-interfaces
@@ -115,7 +115,7 @@ main() {
 	# We are done when IPsec is not enabled
 	if [ "${ENABLED}" = "on" ]; then
 		# Enable route table lookup
-		ip rule add lookup "${ROUTE_TABLE}" prio "${ROUTE_TABLE_PRIO}" >/dev/null 2>&1
+		ip rule add lookup "${ROUTE_TABLE}" prio "${ROUTE_TABLE_PRIO}"
 
 		while IFS="," read -r "${VARS[@]}"; do
 			# Check if the connection is enabled
@@ -158,7 +158,7 @@ main() {
 
 						log "Creating route to ${rightsubnet} (via ${address} and ${RED_INTF})"
 						ip route add table "${ROUTE_TABLE}" "${rightsubnet}" proto static \
-							dev "${RED_INTF}" src "${address}" >/dev/null 2>&1
+							dev "${RED_INTF}" src "${address}"
 					done
 
 					# No interface processing required
-- 
2.39.2

[PATCH 2/9] Revert "static-routes: Fixes bug12763"

[Michael Tremer]

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

This reverts commit e33ee46e621eb6967c954a9d3b4683880e372579.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/initscripts/system/static-routes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/initscripts/system/static-routes b/src/initscripts/system/static-routes
index 9aacc8db5..9029c94db 100644
--- a/src/initscripts/system/static-routes
+++ b/src/initscripts/system/static-routes
@@ -29,7 +29,7 @@ function init_table() {
 		return
 	fi
 
-	ip rule add table static >/dev/null 2>&1
+	ip rule add table static
 }
 
 function create_all_routes() {
@@ -54,7 +54,7 @@ function create_all_routes() {
 			continue
 		fi
 
-		ip route add ${network} via ${gateway} table static proto static >/dev/null 2>&1
+		ip route add ${network} via ${gateway} table static proto static
 	done < ${file}
 }
 
-- 
2.39.2

Re: [PATCH 2/9] Revert "static-routes: Fixes bug12763"

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This reverts commit e33ee46e621eb6967c954a9d3b4683880e372579.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   src/initscripts/system/static-routes | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/initscripts/system/static-routes b/src/initscripts/system/static-routes
> index 9aacc8db5..9029c94db 100644
> --- a/src/initscripts/system/static-routes
> +++ b/src/initscripts/system/static-routes
> @@ -29,7 +29,7 @@ function init_table() {
>   		return
>   	fi
>   
> -	ip rule add table static >/dev/null 2>&1
> +	ip rule add table static
>   }
>   
>   function create_all_routes() {
> @@ -54,7 +54,7 @@ function create_all_routes() {
>   			continue
>   		fi
>   
> -		ip route add ${network} via ${gateway} table static proto static >/dev/null 2>&1
> +		ip route add ${network} via ${gateway} table static proto static
>   	done < ${file}
>   }
>   

[PATCH 3/9] Revert "red: Fixes bug12763"

[Michael Tremer]

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

This reverts commit 9c28cd59c1b4f535382e5e4e7952d921af8cc03b.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/initscripts/networking/red | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 51bf95a43..beb665e5f 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -129,10 +129,10 @@ case "${1}" in
 			touch /var/ipfire/red/active
 
 			# Create route to default gateway
-			ip route add ${GATEWAY} dev ${DEVICE} >/dev/null 2>&1
+			ip route add ${GATEWAY} dev ${DEVICE}
 
 			boot_mesg "Setting up default gateway ${GATEWAY}..."
-			ip route add default via ${GATEWAY} dev ${DEVICE} >/dev/null 2>&1
+			ip route add default via ${GATEWAY} dev ${DEVICE}
 			evaluate_retval
 
 			if [ -d "/sys/class/net/${DEVICE}" ]; then
-- 
2.39.2

Re: [PATCH 3/9] Revert "red: Fixes bug12763"

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This reverts commit 9c28cd59c1b4f535382e5e4e7952d921af8cc03b.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   src/initscripts/networking/red | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
> index 51bf95a43..beb665e5f 100644
> --- a/src/initscripts/networking/red
> +++ b/src/initscripts/networking/red
> @@ -129,10 +129,10 @@ case "${1}" in
>   			touch /var/ipfire/red/active
>   
>   			# Create route to default gateway
> -			ip route add ${GATEWAY} dev ${DEVICE} >/dev/null 2>&1
> +			ip route add ${GATEWAY} dev ${DEVICE}
>   
>   			boot_mesg "Setting up default gateway ${GATEWAY}..."
> -			ip route add default via ${GATEWAY} dev ${DEVICE} >/dev/null 2>&1
> +			ip route add default via ${GATEWAY} dev ${DEVICE}
>   			evaluate_retval
>   
>   			if [ -d "/sys/class/net/${DEVICE}" ]; then

[PATCH 4/9] Revert "ip-up: Fixes bug12763"

[Michael Tremer]

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

This reverts commit 4f455c488ee8542bea4ccbe439351b3e9973c6e4.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/ppp/ip-up | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index 5f4ee7726..2e636e72d 100644
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -33,7 +33,7 @@ echo -n "$4" > /var/ipfire/red/local-ipaddress
 echo -n "$5" > /var/ipfire/red/remote-ipaddress
 touch /var/ipfire/red/active
 
-/sbin/ip route replace default via ${IPREMOTE} dev ppp0 >/dev/null 2>&1
+/sbin/ip route replace default via ${IPREMOTE} dev ppp0
 run_subdir ${rc_base}/init.d/networking/red.up/
 
 #Check if gateway has answerd to ping, if not replace with ping.ipfire.org
-- 
2.39.2

Re: [PATCH 4/9] Revert "ip-up: Fixes bug12763"

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This reverts commit 4f455c488ee8542bea4ccbe439351b3e9973c6e4.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   src/ppp/ip-up | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/ppp/ip-up b/src/ppp/ip-up
> index 5f4ee7726..2e636e72d 100644
> --- a/src/ppp/ip-up
> +++ b/src/ppp/ip-up
> @@ -33,7 +33,7 @@ echo -n "$4" > /var/ipfire/red/local-ipaddress
>   echo -n "$5" > /var/ipfire/red/remote-ipaddress
>   touch /var/ipfire/red/active
>   
> -/sbin/ip route replace default via ${IPREMOTE} dev ppp0 >/dev/null 2>&1
> +/sbin/ip route replace default via ${IPREMOTE} dev ppp0
>   run_subdir ${rc_base}/init.d/networking/red.up/
>   
>   #Check if gateway has answerd to ping, if not replace with ping.ipfire.org

[PATCH 5/9] Revert "aws-setup: Fixes bug12763"

[Michael Tremer]

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

This reverts commit eb0de6531c441663477cf7e139f1bd5321630eef.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/initscripts/helper/aws-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index 0bcf75572..f14f4eb57 100644
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -278,7 +278,7 @@ case "${reason}" in
 		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
 
 		# Add the default route
-		ip route add default via "${new_routers}" >/dev/null 2>&1
+		ip route add default via "${new_routers}"
 
 		# Setup DNS
 		for domain_name_server in ${new_domain_name_servers}; do
-- 
2.39.2

Re: [PATCH 5/9] Revert "aws-setup: Fixes bug12763"

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This reverts commit eb0de6531c441663477cf7e139f1bd5321630eef.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   src/initscripts/helper/aws-setup | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
> index 0bcf75572..f14f4eb57 100644
> --- a/src/initscripts/helper/aws-setup
> +++ b/src/initscripts/helper/aws-setup
> @@ -278,7 +278,7 @@ case "${reason}" in
>   		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
>   
>   		# Add the default route
> -		ip route add default via "${new_routers}" >/dev/null 2>&1
> +		ip route add default via "${new_routers}"
>   
>   		# Setup DNS
>   		for domain_name_server in ${new_domain_name_servers}; do

[PATCH 6/9] Revert "azure-setup: Fixes bug12763"

[Michael Tremer]

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

This reverts commit 1db5f96c5ebbb2074c9c0a3edf29866c4769da11.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/initscripts/helper/azure-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup
index eff963a4b..7a4422a35 100644
--- a/src/initscripts/helper/azure-setup
+++ b/src/initscripts/helper/azure-setup
@@ -298,7 +298,7 @@ case "${reason}" in
 		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
 
 		# Add the default route
-		ip route add default via "${new_routers}" >/dev/null 2>&1
+		ip route add default via "${new_routers}"
 
 		# Setup DNS
 		for domain_name_server in ${new_domain_name_servers}; do
-- 
2.39.2

Re: [PATCH 6/9] Revert "azure-setup: Fixes bug12763"

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This reverts commit 1db5f96c5ebbb2074c9c0a3edf29866c4769da11.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   src/initscripts/helper/azure-setup | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup
> index eff963a4b..7a4422a35 100644
> --- a/src/initscripts/helper/azure-setup
> +++ b/src/initscripts/helper/azure-setup
> @@ -298,7 +298,7 @@ case "${reason}" in
>   		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
>   
>   		# Add the default route
> -		ip route add default via "${new_routers}" >/dev/null 2>&1
> +		ip route add default via "${new_routers}"
>   
>   		# Setup DNS
>   		for domain_name_server in ${new_domain_name_servers}; do

[PATCH 7/9] Revert "exoscale-setup: Fixes bug12763"

[Michael Tremer]

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

This reverts commit 3162b6ccfa2fb22513c7d23d29f0509343f46828.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/initscripts/helper/exoscale-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup
index acf5e4e4b..02fdda2a3 100644
--- a/src/initscripts/helper/exoscale-setup
+++ b/src/initscripts/helper/exoscale-setup
@@ -227,7 +227,7 @@ case "${reason}" in
 		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
 
 		# Add the default route
-		ip route add default via "${new_routers}" >/dev/null 2>&1
+		ip route add default via "${new_routers}"
 
 		# Setup DNS
 		for domain_name_server in ${new_domain_name_servers}; do
-- 
2.39.2

Re: [PATCH 7/9] Revert "exoscale-setup: Fixes bug12763"

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This reverts commit 3162b6ccfa2fb22513c7d23d29f0509343f46828.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   src/initscripts/helper/exoscale-setup | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup
> index acf5e4e4b..02fdda2a3 100644
> --- a/src/initscripts/helper/exoscale-setup
> +++ b/src/initscripts/helper/exoscale-setup
> @@ -227,7 +227,7 @@ case "${reason}" in
>   		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
>   
>   		# Add the default route
> -		ip route add default via "${new_routers}" >/dev/null 2>&1
> +		ip route add default via "${new_routers}"
>   
>   		# Setup DNS
>   		for domain_name_server in ${new_domain_name_servers}; do

[PATCH 8/9] Revert "gcp-setup: Fixes bug12763"

[Michael Tremer]

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

This reverts commit 2841a675482879a5eb6bfeaabb268066af762e9d.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/initscripts/helper/gcp-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/initscripts/helper/gcp-setup b/src/initscripts/helper/gcp-setup
index 8273b70b4..4f5148c3e 100644
--- a/src/initscripts/helper/gcp-setup
+++ b/src/initscripts/helper/gcp-setup
@@ -268,8 +268,8 @@ case "${reason}" in
 		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
 
 		# Add the default route
-		ip route add "${new_routers}" dev "${interface}" >/dev/null 2>&1
-		ip route add default via "${new_routers}" >/dev/null 2>&1
+		ip route add "${new_routers}" dev "${interface}"
+		ip route add default via "${new_routers}"
 
 		# Setup DNS
 		for domain_name_server in ${new_domain_name_servers}; do
-- 
2.39.2

Re: [PATCH 8/9] Revert "gcp-setup: Fixes bug12763"

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This reverts commit 2841a675482879a5eb6bfeaabb268066af762e9d.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   src/initscripts/helper/gcp-setup | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/initscripts/helper/gcp-setup b/src/initscripts/helper/gcp-setup
> index 8273b70b4..4f5148c3e 100644
> --- a/src/initscripts/helper/gcp-setup
> +++ b/src/initscripts/helper/gcp-setup
> @@ -268,8 +268,8 @@ case "${reason}" in
>   		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
>   
>   		# Add the default route
> -		ip route add "${new_routers}" dev "${interface}" >/dev/null 2>&1
> -		ip route add default via "${new_routers}" >/dev/null 2>&1
> +		ip route add "${new_routers}" dev "${interface}"
> +		ip route add default via "${new_routers}"
>   
>   		# Setup DNS
>   		for domain_name_server in ${new_domain_name_servers}; do

[PATCH 9/9] Revert "oci-setup: Fixes bug12763"

[Michael Tremer]

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

This reverts commit 238a47874fe044ae90129bde10b267063c4305f5.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 src/initscripts/helper/oci-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/initscripts/helper/oci-setup b/src/initscripts/helper/oci-setup
index 727537343..312014b74 100644
--- a/src/initscripts/helper/oci-setup
+++ b/src/initscripts/helper/oci-setup
@@ -304,8 +304,8 @@ case "${reason}" in
 		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
 
 		# Add the default route
-		ip route add "${new_routers}" dev "${interface}" >/dev/null 2>&1
-		ip route add default via "${new_routers}" >/dev/null 2>&1
+		ip route add "${new_routers}" dev "${interface}"
+		ip route add default via "${new_routers}"
 
 		# Setup DNS
 		for domain_name_server in ${new_domain_name_servers}; do
-- 
2.39.2

Re: [PATCH 9/9] Revert "oci-setup: Fixes bug12763"

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This reverts commit 238a47874fe044ae90129bde10b267063c4305f5.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   src/initscripts/helper/oci-setup | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/initscripts/helper/oci-setup b/src/initscripts/helper/oci-setup
> index 727537343..312014b74 100644
> --- a/src/initscripts/helper/oci-setup
> +++ b/src/initscripts/helper/oci-setup
> @@ -304,8 +304,8 @@ case "${reason}" in
>   		ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}"
>   
>   		# Add the default route
> -		ip route add "${new_routers}" dev "${interface}" >/dev/null 2>&1
> -		ip route add default via "${new_routers}" >/dev/null 2>&1
> +		ip route add "${new_routers}" dev "${interface}"
> +		ip route add default via "${new_routers}"
>   
>   		# Setup DNS
>   		for domain_name_server in ${new_domain_name_servers}; do

Re: [PATCH 1/9] ipsec-interfaces: Don't throw away errors when creating routes

[Adolf Belka]

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

Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This partly reverts 87a97a431915849cf6d19e1b7137b4fb0b6dd91d.
>
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   src/scripts/ipsec-interfaces | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces
> index 974d3ac84..b05b2009c 100644
> --- a/src/scripts/ipsec-interfaces
> +++ b/src/scripts/ipsec-interfaces
> @@ -115,7 +115,7 @@ main() {
>   	# We are done when IPsec is not enabled
>   	if [ "${ENABLED}" = "on" ]; then
>   		# Enable route table lookup
> -		ip rule add lookup "${ROUTE_TABLE}" prio "${ROUTE_TABLE_PRIO}" >/dev/null 2>&1
> +		ip rule add lookup "${ROUTE_TABLE}" prio "${ROUTE_TABLE_PRIO}"
>   
>   		while IFS="," read -r "${VARS[@]}"; do
>   			# Check if the connection is enabled
> @@ -158,7 +158,7 @@ main() {
>   
>   						log "Creating route to ${rightsubnet} (via ${address} and ${RED_INTF})"
>   						ip route add table "${ROUTE_TABLE}" "${rightsubnet}" proto static \
> -							dev "${RED_INTF}" src "${address}" >/dev/null 2>&1
> +							dev "${RED_INTF}" src "${address}"
>   					done
>   
>   					# No interface processing required