From ea4fa71f69f30ae4d23ddabe4fe938df67d72c3e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 19 Feb 2013 19:19:29 +0000
Subject: (read) check shorewall enabling via systemd (mga#8699, from Rosa)
---
NEWS | 2 ++
lib/network/shorewall.pm | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/NEWS b/NEWS
index 7e4cb3e..f340ef4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- check shorewall enabling via systemd (mga#8699, from Rosa)
+
1.18:
- drop broadcom-wl reference during free driver tests
- monitor: allow wpa_cli to report signale strength in dBm (Derek Jennings, #8228)
diff --git a/lib/network/shorewall.pm b/lib/network/shorewall.pm
index 49cf01a..a032587 100644
--- a/lib/network/shorewall.pm
+++ b/lib/network/shorewall.pm
@@ -108,7 +108,7 @@ sub read {
my ($o_in) = @_;
#- 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');
- my %conf = (disabled => !glob_("$::prefix/etc/rc3.d/S*shorewall"),
+ my %conf = (disabled => services::is_service_running(shorewall),
ports => join(' ', map {
my $e = $_;
map { "$_/$e->[3]" } split(',', $e->[4]);
--
cgit v1.2.1