diff options
| author | Olivier Blin <blino@mageia.org> | 2013-03-24 14:46:39 +0000 |
|---|---|---|
| committer | Olivier Blin <blino@mageia.org> | 2013-03-24 14:46:39 +0000 |
| commit | 41b10c74f06cd9bf2a267f88c6aa1d3529a5c06f (patch) | |
| tree | f6f24bf902efabc221426c0e610fb7c5cec84483 | |
| parent | 12666da66e77c33a78360d6e917d93d3cbcea75b (diff) | |
| download | drakx-net-41b10c74f06cd9bf2a267f88c6aa1d3529a5c06f.tar drakx-net-41b10c74f06cd9bf2a267f88c6aa1d3529a5c06f.tar.gz drakx-net-41b10c74f06cd9bf2a267f88c6aa1d3529a5c06f.tar.bz2 drakx-net-41b10c74f06cd9bf2a267f88c6aa1d3529a5c06f.tar.xz drakx-net-41b10c74f06cd9bf2a267f88c6aa1d3529a5c06f.zip | |
drakfirewall: fix detecting if shorewall is enabled (mga#8699)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/network/shorewall.pm | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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]); |