summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-05-26 10:35:21 +0000
committerOlivier Blin <oblin@mandriva.org>2005-05-26 10:35:21 +0000
commitc602ef6cd0264ba656d9248acf9b40dd57382b61 (patch)
treec1133b5d40d50515c2621a15f1d389c68febc716
parent547c513f327ce7ce2477a535c4ba844c436de43e (diff)
downloaddrakx-backup-do-not-use-c602ef6cd0264ba656d9248acf9b40dd57382b61.tar
drakx-backup-do-not-use-c602ef6cd0264ba656d9248acf9b40dd57382b61.tar.gz
drakx-backup-do-not-use-c602ef6cd0264ba656d9248acf9b40dd57382b61.tar.bz2
drakx-backup-do-not-use-c602ef6cd0264ba656d9248acf9b40dd57382b61.tar.xz
drakx-backup-do-not-use-c602ef6cd0264ba656d9248acf9b40dd57382b61.zip
simplify check_iptables()
-rw-r--r--perl-install/network/shorewall.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index 82d3c5ec0..49fafb8f3 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -13,10 +13,8 @@ use log;
sub check_iptables {
- my ($in) = @_;
-
- my $existing_config = -f "$::prefix/etc/sysconfig/iptables";
- $existing_config ||= $::isStandalone && do {
+ -f "$::prefix/etc/sysconfig/iptables" ||
+ $::isStandalone && do {
system('modprobe iptable_nat');
-x '/sbin/iptables' && listlength(`/sbin/iptables -t nat -nL`) > 8;
};