summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-02-17 17:22:27 +0000
committerOlivier Blin <oblin@mandriva.org>2005-02-17 17:22:27 +0000
commit9d261654a80c56a46c303dcef27eb745e7815044 (patch)
treebbcd8f124b3a0a8b75a1ccec03659e9e5bf2eb21 /perl-install
parentf7d7214aa239ed16ad8ce0c98e73aa321481568a (diff)
downloaddrakx-9d261654a80c56a46c303dcef27eb745e7815044.tar
drakx-9d261654a80c56a46c303dcef27eb745e7815044.tar.gz
drakx-9d261654a80c56a46c303dcef27eb745e7815044.tar.bz2
drakx-9d261654a80c56a46c303dcef27eb745e7815044.tar.xz
drakx-9d261654a80c56a46c303dcef27eb745e7815044.zip
use network::shorewall::get_net_device
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/shorewall.pm2
-rwxr-xr-xperl-install/standalone/drakgw4
-rw-r--r--perl-install/standalone/drakvpn2
3 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index 6c930d0e4..8ea4ef113 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -72,7 +72,7 @@ sub default_interfaces_silent {
sub default_interfaces {
my ($in) = @_;
my %conf;
- my $card_netconnect = network::netconnect::get_net_device() || "eth0";
+ my $card_netconnect = get_net_device() || "eth0";
defined $card_netconnect and log::l("[drakgw] Information from netconnect: ignore card $card_netconnect");
my @l = detect_devices::getNet() or return;
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index f76e2b2af..d00cba315 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -206,8 +206,8 @@ my @configured_devices = map { /ifcfg-(\S+)/ } glob('/etc/sysconfig/network-scri
my %aliased_devices;
/^\s*alias\s+(eth[0-9])\s+(\S+)/ and $aliased_devices{$1} = $2 foreach cat_("/etc/modules.conf");
-my $card_netconnect = network::netconnect::get_net_device() || "eth0";
-defined $card_netconnect and log::l("[drakgw] Information from netconnect: ignore card $card_netconnect");
+my $card_netconnect = network::shorewall::get_net_device() || "eth0";
+log::l("[drakgw] Information from netconnect: ignore card $card_netconnect");
my $modules_conf = modules::any_conf->read;
my @all_cards = network::ethernet::get_eth_cards($modules_conf);
diff --git a/perl-install/standalone/drakvpn b/perl-install/standalone/drakvpn
index ae9d7ae64..1f7a8dce4 100644
--- a/perl-install/standalone/drakvpn
+++ b/perl-install/standalone/drakvpn
@@ -207,7 +207,7 @@ step_detectsetup:
my %aliased_devices;
/^\s*alias\s+(eth[0-9])\s+(\S+)/ and $aliased_devices{$1} = $2 foreach cat_("/etc/modules.conf");
-my $card_netconnect = network::netconnect::get_net_device() || "eth0";
+my $card_netconnect = network::shorewall::get_net_device() || "eth0";
defined $card_netconnect and log::l("[drakvpn] Information from netconnect: ignore card $card_netconnect");
$in->ask_from('',