holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Don't insist that route deletion succeeds

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-11-12 08:38:09 -08:00
parent 6b38b3a515
commit 481afef2c3
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -1515,11 +1515,12 @@ sub finish_providers() {
emit ( " run_ip -4 route replace default scope global table $table \$DEFAULT_ROUTE" ); emit ( " run_ip -4 route replace default scope global table $table \$DEFAULT_ROUTE" );
} else { } else {
emit ( " if echo \$DEFAULT_ROUTE | grep -q 'nexthop.+nexthop'; then", emit ( " if echo \$DEFAULT_ROUTE | grep -q 'nexthop.+nexthop'; then",
" run_ip -6 route delete default scope global table $table \$DEFAULT_ROUTE", " qt \$IP -6 route delete default scope global table $table \$DEFAULT_ROUTE",
" run_ip -6 route add default scope global table $table \$DEFAULT_ROUTE", " run_ip -6 route add default scope global table $table \$DEFAULT_ROUTE",
' else', ' else',
" run_ip -6 route replace default scope global table $table \$DEFAULT_ROUTE", " run_ip -6 route replace default scope global table $table \$DEFAULT_ROUTE",
' fi' ); ' fi',
'' );
} }
if ( $config{USE_DEFAULT_RT} ) { if ( $config{USE_DEFAULT_RT} ) {