summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-09-15 05:35:02 +0000
committerOlivier Blin <oblin@mandriva.org>2005-09-15 05:35:02 +0000
commitff491e22b7d1ff200208507333fa647dbf3fee35 (patch)
treef932a0ea805f1201eabce8c93c76ea7da80b70f9 /perl-install/network
parent66aaacccef30a11afb63ae991436c96fc99d6fbd (diff)
downloaddrakx-ff491e22b7d1ff200208507333fa647dbf3fee35.tar
drakx-ff491e22b7d1ff200208507333fa647dbf3fee35.tar.gz
drakx-ff491e22b7d1ff200208507333fa647dbf3fee35.tar.bz2
drakx-ff491e22b7d1ff200208507333fa647dbf3fee35.tar.xz
drakx-ff491e22b7d1ff200208507333fa647dbf3fee35.zip
read shorewall net interface from configuration file first
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/shorewall.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index 90705ee41..07b791ed1 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -41,6 +41,11 @@ sub get_ifcfg_interface() {
}
sub get_shorewall_interface() {
+ #- read shorewall configuration first
+ foreach (get_config_file('interfaces')) {
+ $_->[0] eq 'net' and return $_->[1];
+ }
+ #- else try to find the best interface available
my $default_dev = get_ifcfg_interface();
$default_dev =~ /^ippp/ && "ippp+" ||
$default_dev =~ /^ppp/ && "ppp+" ||