diff --git a/usr/local/lib/network.bash b/usr/local/lib/network.bash index 8ba3b8e..b6f70a2 100644 --- a/usr/local/lib/network.bash +++ b/usr/local/lib/network.bash @@ -533,11 +533,6 @@ network_table_init() network_table_deinit() { - ${LOG} "Remove default route in table 3" - - ${DEBUG} ip route del default table 3 - - ${LOG} "Remove Rx3 routes in VPN tables" for table in ${NETWORK_TABLE_LIST} @@ -547,6 +542,16 @@ network_table_deinit() ${DEBUG} ip route del ${route/:*/} table ${table} dev ${route/*:/} 2>/dev/null done done + + for dst_id in ${NETWORK_DST_ID_LIST} + do + network_dst_tab_get ${dst_id} + + + ${LOG} "Remove default route in table: [${dst_table}]" + + ${DEBUG} ip route del default table ${dst_table} + done } @@ -657,7 +662,7 @@ function bridge_down ${LOG} "Remove bridge [${bd_bridge_device}]..." - ${DEBUG} ip link show ${bd_bridge_device} && ${DEBUG} ip link del ${bd_bridge_device} + ${DEBUG} ip link show ${bd_bridge_device} &>/dev/null && ${DEBUG} ip link del ${bd_bridge_device} } diff --git a/usr/local/sbin/rx3_net_adm b/usr/local/sbin/rx3_net_adm index 13771c8..ad1e9e2 100755 --- a/usr/local/sbin/rx3_net_adm +++ b/usr/local/sbin/rx3_net_adm @@ -4,7 +4,7 @@ RETVAL=0 prog="rx3-net" #DEBUG="" -DEBUG="echo" +#DEBUG="echo" #DEBUG=":" #LOG=":"