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

Message ID 20240510120234.995049-9-michael.tremer@ipfire.org
State Staged
Commit 7825fd0f4b084d6c0ca606439f047180bf476146
Headers
Series [1/9] ipsec-interfaces: Don't throw away errors when creating routes |

Commit Message

Michael Tremer May 10, 2024, 12:02 p.m. UTC
  This reverts commit 238a47874fe044ae90129bde10b267063c4305f5.

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

Comments

Adolf Belka May 10, 2024, 3:24 p.m. UTC | #1
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>

On 10/05/2024 14:02, Michael Tremer wrote:
> This reverts commit 238a47874fe044ae90129bde10b267063c4305f5.
>
> Signed-off-by: Michael Tremer <michael.tremer@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
  

Patch

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