summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-07-26 11:09:20 +0000
committerOlivier Blin <oblin@mandriva.org>2005-07-26 11:09:20 +0000
commit289cdfbdf988fb3b2f0f659c4dc95a67ef0335ba (patch)
tree8aebe0651610dda8d2f66e98b816e2a1afd5f743
parent4ac27d9cbacd8e36333dac1bf544cd2f9e70caa1 (diff)
downloaddrakx-backup-do-not-use-289cdfbdf988fb3b2f0f659c4dc95a67ef0335ba.tar
drakx-backup-do-not-use-289cdfbdf988fb3b2f0f659c4dc95a67ef0335ba.tar.gz
drakx-backup-do-not-use-289cdfbdf988fb3b2f0f659c4dc95a67ef0335ba.tar.bz2
drakx-backup-do-not-use-289cdfbdf988fb3b2f0f659c4dc95a67ef0335ba.tar.xz
drakx-backup-do-not-use-289cdfbdf988fb3b2f0f659c4dc95a67ef0335ba.zip
run shorewall clear if firewall is stopped (#17046)
-rw-r--r--perl-install/network/shorewall.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index aeb951d78..2775f2e08 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -141,7 +141,12 @@ sub write {
set_config_file('masq', if_($conf->{masq_subnet}, [ $conf->{net_interface}, $conf->{masq_subnet} ]));
require services;
- services::set_status('shorewall', !$conf->{disabled}, $::isInstall);
+ if ($conf->{disabled}) {
+ services::disable('shorewall', $::isInstall);
+ run_program::rooted($::prefix, '/sbin/shorewall', 'clear') unless $::isInstall;
+ } else {
+ services::enable('shorewall', $::isInstall);
+ }
}
1;