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

Handle Debian pre-down/post-down correctly

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-06-02 09:26:00 -07:00
parent 579104833e
commit 9e9c44d4ac
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1438,7 +1438,7 @@ sub compile_updown() {
q( COMMAND=enable) , q( COMMAND=enable) ,
q( detect_configuration), q( detect_configuration),
q( enable_provider $1), q( enable_provider $1),
q( else) , q( elif [ "$PHASE" != post-down ]; then # pre-down or not Debian) ,
q( progress_message3 "Attempting disable on interface $1") , q( progress_message3 "Attempting disable on interface $1") ,
q( COMMAND=disable) , q( COMMAND=disable) ,
q( detect_configuration), q( detect_configuration),
@ -1478,22 +1478,30 @@ sub compile_updown() {
emit( ' progress_message3 "$g_product attempting $COMMAND"', emit( ' progress_message3 "$g_product attempting $COMMAND"',
' detect_configuration', ' detect_configuration',
' define_firewall' ); ' define_firewall',
' elif [ "$PHASE" != pre-down ]; then # Not Debian pre-down phase'
);
push_indent;
if ( $wildcard ) { if ( $wildcard ) {
emit( ' elif [ "$state" = started ]; then',
emit( ' if [ "$state" = started ]; then',
' progress_message3 "$g_product attempting restart"', ' progress_message3 "$g_product attempting restart"',
' COMMAND=restart', ' COMMAND=restart',
' detect_configuration', ' detect_configuration',
' define_firewall' ); ' define_firewall',
' fi' );
} else { } else {
emit( ' else', emit( ' COMMAND=stop',
' COMMAND=stop', ' progress_message3 "$g_product attempting stop"',
' progress_message3 "$g_product attempting stop"', ' detect_configuration',
' detect_configuration', ' stop_firewall' );
' stop_firewall' );
} }
pop_indent;
emit( ' fi', emit( ' fi',
' ;;' ' ;;'
); );