- Minor fixes in deinit code.
This commit is contained in:
@@ -533,11 +533,6 @@ network_table_init()
|
|||||||
|
|
||||||
network_table_deinit()
|
network_table_deinit()
|
||||||
{
|
{
|
||||||
${LOG} "Remove default route in table 3"
|
|
||||||
|
|
||||||
${DEBUG} ip route del default table 3
|
|
||||||
|
|
||||||
|
|
||||||
${LOG} "Remove Rx3 routes in VPN tables"
|
${LOG} "Remove Rx3 routes in VPN tables"
|
||||||
|
|
||||||
for table in ${NETWORK_TABLE_LIST}
|
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
|
${DEBUG} ip route del ${route/:*/} table ${table} dev ${route/*:/} 2>/dev/null
|
||||||
done
|
done
|
||||||
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}]..."
|
${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}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ RETVAL=0
|
|||||||
prog="rx3-net"
|
prog="rx3-net"
|
||||||
|
|
||||||
#DEBUG=""
|
#DEBUG=""
|
||||||
DEBUG="echo"
|
#DEBUG="echo"
|
||||||
#DEBUG=":"
|
#DEBUG=":"
|
||||||
|
|
||||||
#LOG=":"
|
#LOG=":"
|
||||||
|
|||||||
Reference in New Issue
Block a user