summaryrefslogtreecommitdiffstats
path: root/lib/network
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-02-19 19:19:29 +0000
committerThierry Vignaud <tv@mageia.org>2013-02-19 19:19:29 +0000
commitea4fa71f69f30ae4d23ddabe4fe938df67d72c3e (patch)
tree65b9904e201dec0417c9f545bfbf1384069d84d2 /lib/network
parentc8d0ca420fb9a80ea7ded95ca35fdd5d98596068 (diff)
downloaddrakx-net-ea4fa71f69f30ae4d23ddabe4fe938df67d72c3e.tar
drakx-net-ea4fa71f69f30ae4d23ddabe4fe938df67d72c3e.tar.gz
drakx-net-ea4fa71f69f30ae4d23ddabe4fe938df67d72c3e.tar.bz2
drakx-net-ea4fa71f69f30ae4d23ddabe4fe938df67d72c3e.tar.xz
drakx-net-ea4fa71f69f30ae4d23ddabe4fe938df67d72c3e.zip
(read) check shorewall enabling via systemd (mga#8699, from Rosa)
Diffstat (limited to 'lib/network')
-rw-r--r--lib/network/shorewall.pm2
1 files changed, 1 insertions, 1 deletions
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]);