summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-05 00:08:14 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-05 00:08:14 +0000
commitda1b605bec29304f1337f45c777929cd46313102 (patch)
tree81197ad5d57719006cad7fbe19482dfe4eddbe63
parent25a03a501e1c0d3a2beedb1c8ca46393092e1c55 (diff)
downloaddrakx-net-da1b605bec29304f1337f45c777929cd46313102.tar
drakx-net-da1b605bec29304f1337f45c777929cd46313102.tar.gz
drakx-net-da1b605bec29304f1337f45c777929cd46313102.tar.bz2
drakx-net-da1b605bec29304f1337f45c777929cd46313102.tar.xz
drakx-net-da1b605bec29304f1337f45c777929cd46313102.zip
use firewall icon from control center in non-install mode
-rw-r--r--lib/network/drakfirewall.pm4
-rw-r--r--lib/network/shorewall.pm3
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index 40b1155..537790c 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -188,7 +188,7 @@ sub choose_allowed_services {
$in->ask_from_({
messages => N("Which services would you like to allow the Internet to connect to?"),
title => N("Firewall"),
- icon => 'banner-security',
+ icon => $network::shorewall::firewall_icon,
banner_title => N("Firewall"),
advanced_messages => N("You can enter miscellaneous ports.
Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/udp.
@@ -252,7 +252,7 @@ sub choose_watched_services {
$_->{ifw} = 1 foreach @l;
$in->ask_from_({
- icon => 'banner-security',
+ icon => $network::shorewall::firewall_icon,
banner_title => N("Interactive Firewall"),
messages =>
N("You can be warned when someone accesses to a service or tries to intrude into your computer.
diff --git a/lib/network/shorewall.pm b/lib/network/shorewall.pm
index d191808..ef3ba60 100644
--- a/lib/network/shorewall.pm
+++ b/lib/network/shorewall.pm
@@ -7,6 +7,7 @@ use common;
use log;
my $shorewall_root = "/etc/shorewall";
+our $firewall_icon = $::isInstall ? 'banner-security' : '/usr/share/mcc/themes/default/firewall-mdk.png';
sub check_iptables() {
-f "$::prefix/etc/sysconfig/iptables" ||
@@ -60,7 +61,7 @@ sub get_zones {
$net_zone{$_} = 1 foreach get_net_zone_interfaces($net, \@all_intf);
$o_in and $o_in->ask_from_({
title => N("Firewall configuration"),
- icon => 'banner-security',
+ icon => $firewall_icon,
messages => N("Please select the interfaces that will be protected by the firewall.
All interfaces directly connected to Internet should be selected,