diff options
| author | Olivier Blin <oblin@mandriva.com> | 2010-04-30 13:29:37 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2010-04-30 13:29:37 +0000 |
| commit | 651b1d7697c58e7b275b161a8cdde697ff170949 (patch) | |
| tree | 6d85ee872d186e16eb1cf6cccba9d14f3c2c80c4 | |
| parent | 826e8027f8ee411c862f545280d6ba41ba624cab (diff) | |
| download | drakx-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
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/network/drakfirewall.pm | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -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; } |