summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-04-30 13:29:37 +0000
committerOlivier Blin <oblin@mandriva.com>2010-04-30 13:29:37 +0000
commit651b1d7697c58e7b275b161a8cdde697ff170949 (patch)
tree6d85ee872d186e16eb1cf6cccba9d14f3c2c80c4 /lib
parent826e8027f8ee411c862f545280d6ba41ba624cab (diff)
downloaddrakx-net-651b1d7697c58e7b275b161a8cdde697ff170949.tar
drakx-net-651b1d7697c58e7b275b161a8cdde697ff170949.tar.gz
drakx-net-651b1d7697c58e7b275b161a8cdde697ff170949.tar.bz2
drakx-net-651b1d7697c58e7b275b161a8cdde697ff170949.tar.xz
drakx-net-651b1d7697c58e7b275b161a8cdde697ff170949.zip
allow to skip Interactive Firewall configuration if IFW is set to no in /etc/sysconfig/drakx-net
Diffstat (limited to 'lib')
-rw-r--r--lib/network/drakfirewall.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index df9ba4f..5746ae7 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -336,7 +336,10 @@ sub main {
($disabled, $servers, $unlisted, $log_net_drop) = choose_allowed_services($in, $disabled, $servers, $unlisted, $log_net_drop) or return;
- if (!$disabled) {
+ my $system_file = '/etc/sysconfig/drakx-net';
+ my %global_settings = getVarsFromSh($system_file);
+
+ if (!$disabled && (!defined($global_settings{IFW}) || text2bool($global_settings{IFW}))) {
choose_watched_services($in, $servers, $unlisted) or return;
}