From 289cdfbdf988fb3b2f0f659c4dc95a67ef0335ba Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Tue, 26 Jul 2005 11:09:20 +0000
Subject: run shorewall clear if firewall is stopped (#17046)

---
 perl-install/network/shorewall.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/network/shorewall.pm')

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;
-- 
cgit v1.2.1