extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-25 00:53:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid 'ip' error messages due to missing optional interface

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2024-03-10 12:55:34 -07:00
parent 895428c7c1
commit 8f826ce70d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-core/lib.common
View File

@ -639,7 +639,7 @@ find_first_interface_address_if_any() # $1 = interface
#Determines if the passed interface is a loopback interface #Determines if the passed interface is a loopback interface
# #
loopback_interface() { #$1 = Interface name loopback_interface() { #$1 = Interface name
[ "$1" = lo ] || $IP link show $1 | fgrep -q LOOPBACK [ "$1" = lo ] || $IP link show $1 2>/dev/null | fgrep -q LOOPBACK
} }
# #

10
Shorewall/Perl/lib.runtime
View File

@ -878,7 +878,7 @@ detect_dynamic_gateway() { # $1 = interface
gateway=$(run_findgw_exit $1); gateway=$(run_findgw_exit $1);
if [ -z "$gateway" ]; then if [ -z "$gateway" ]; then
gateway=$( find_peer $($IP addr list $interface ) ) gateway=$( find_peer $($IP addr list $interface 2>/dev/null ) )
fi fi
file="${VARLIB}/dhcpcd/dhcpcd-${1}.info" file="${VARLIB}/dhcpcd/dhcpcd-${1}.info"
@ -923,9 +923,9 @@ detect_gateway() # $1 = interface $2 = table number
# #
# Maybe there's a default route through this gateway already # Maybe there's a default route through this gateway already
# #
[ -n "$gateway" ] || gateway=$(find_gateway $($IP -4 route list dev $interface | grep ^default)) [ -n "$gateway" ] || gateway=$(find_gateway $($IP -4 route list dev $interface 2>/dev/null | grep ^default))
[ -z "$gateway" -a -n "$2" ] && gateway=$(find_gateway $($IP -4 route list dev $interface table $2 | grep ^default)) [ -z "$gateway" -a -n "$2" ] && gateway=$(find_gateway $($IP -4 route list dev $interface table $2 2>/dev/null | grep ^default))
# #
# Last hope -- is there a load-balancing route through the interface? # Last hope -- is there a load-balancing route through the interface?
# #
@ -1312,11 +1312,11 @@ detect_gateway() # $1 = interface
# #
# First assume that this is some sort of point-to-point interface # First assume that this is some sort of point-to-point interface
# #
gateway=$( find_peer $($IP -6 addr list $interface ) ) gateway=$( find_peer $($IP -6 addr list $interface 2>/dev/null ) )
# #
# Maybe there's a default route through this gateway already # Maybe there's a default route through this gateway already
# #
[ -n "$gateway" ] || gateway=$(find_gateway $($IP -6 route list dev $interface | grep '^default')) [ -n "$gateway" ] || gateway=$(find_gateway $($IP -6 route list dev $interface 2>/dev/null | grep '^default'))
# #
# Last hope -- is there a load-balancing route through the interface? # Last hope -- is there a load-balancing route through the interface?
# #