summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--lib/network/drakfirewall.pm5
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 20e361a..dd838a8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
- fix detecting sysfs bus (only applies to ieee1394 subsystem)
- wireless backend:
o add support for rt2870 driver
+- allow to skip Interactive Firewall configuration if IFW is set to
+ no in /etc/sysconfig/drakx-net
0.88:
- allow draknetprofile module selection to use whole screen.
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;
}