mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-22 23:53:30 +01:00
Correct order of optional interface and address variable handling
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
4e6949f996
commit
9253f90ac5
@ -312,10 +312,8 @@ sub generate_script_2() {
|
||||
push_indent;
|
||||
|
||||
if ( $global_variables == ( ALL_COMMANDS | NOT_RESTORE ) ) {
|
||||
|
||||
set_global_variables(0, 0);
|
||||
|
||||
handle_optional_interfaces(0);
|
||||
set_global_variables(0, 0);
|
||||
}
|
||||
|
||||
emit ';;';
|
||||
@ -327,16 +325,14 @@ sub generate_script_2() {
|
||||
push_indent;
|
||||
}
|
||||
|
||||
handle_optional_interfaces(1);
|
||||
set_global_variables(1,1);
|
||||
|
||||
if ( $global_variables & NOT_RESTORE ) {
|
||||
handle_optional_interfaces(1);
|
||||
emit ';;';
|
||||
pop_indent;
|
||||
pop_indent;
|
||||
emit ( 'esac' );
|
||||
} else {
|
||||
handle_optional_interfaces(1);
|
||||
}
|
||||
} else {
|
||||
emit( 'true' ) unless handle_optional_interfaces(1);
|
||||
|
Loading…
Reference in New Issue
Block a user