From 41b10c74f06cd9bf2a267f88c6aa1d3529a5c06f Mon Sep 17 00:00:00 2001
From: Olivier Blin <blino@mageia.org>
Date: Sun, 24 Mar 2013 14:46:39 +0000
Subject: drakfirewall: fix detecting if shorewall is enabled (mga#8699)

---
 NEWS                     | 2 ++
 lib/network/shorewall.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 90a5059..a580e8f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 - improve MAC adress help
+- drakfirewall:
+  o fix detecting if shorewall is enabled (mga#8699)
 
 1.19.2:
 - re-add broadcom-wl reference
diff --git a/lib/network/shorewall.pm b/lib/network/shorewall.pm
index aa286e7..ee71d1d 100644
--- a/lib/network/shorewall.pm
+++ b/lib/network/shorewall.pm
@@ -109,7 +109,7 @@ sub read {
     #- read old rules file if config is not moved to rules.drakx yet
     my @rules = get_config_file(-f "$::prefix${shorewall_root}/rules.drakx" ? 'rules.drakx' : 'rules');
     require services;
-    my %conf = (disabled => services::is_service_running(shorewall),
+    my %conf = (disabled => !services::starts_on_boot("shorewall"),
                 ports => join(' ', map {
                     my $e = $_;
                     map { "$_/$e->[3]" } split(',', $e->[4]);
-- 
cgit v1.2.1