mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-11 16:18:13 +01:00
Reorganize code around wait/Interface-variable fix
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
0ab1464f51
commit
a6000ee963
@ -312,7 +312,6 @@ sub generate_script_2() {
|
|||||||
push_indent;
|
push_indent;
|
||||||
|
|
||||||
if ( $global_variables == ( ALL_COMMANDS | NOT_RESTORE ) ) {
|
if ( $global_variables == ( ALL_COMMANDS | NOT_RESTORE ) ) {
|
||||||
|
|
||||||
verify_required_interfaces(0);
|
verify_required_interfaces(0);
|
||||||
set_global_variables(0, 0);
|
set_global_variables(0, 0);
|
||||||
handle_optional_interfaces;
|
handle_optional_interfaces;
|
||||||
@ -329,15 +328,13 @@ sub generate_script_2() {
|
|||||||
|
|
||||||
verify_required_interfaces(1);
|
verify_required_interfaces(1);
|
||||||
set_global_variables(1,1);
|
set_global_variables(1,1);
|
||||||
|
handle_optional_interfaces;
|
||||||
|
|
||||||
if ( $global_variables & NOT_RESTORE ) {
|
if ( $global_variables & NOT_RESTORE ) {
|
||||||
handle_optional_interfaces;
|
|
||||||
emit ';;';
|
emit ';;';
|
||||||
pop_indent;
|
pop_indent;
|
||||||
pop_indent;
|
pop_indent;
|
||||||
emit ( 'esac' );
|
emit ( 'esac' );
|
||||||
} else {
|
|
||||||
handle_optional_interfaces;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
verify_required_interfaces(1);
|
verify_required_interfaces(1);
|
||||||
|
Loading…
Reference in New Issue
Block a user