summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-11-25 19:45:25 +0000
committerFrancois Pons <fpons@mandriva.com>2002-11-25 19:45:25 +0000
commit60977c62dfd825cf1414a7eb395b0be53532c6dc (patch)
treeab882e4f2474ec07b45b048f4d4ab472314f41b4 /perl-install
parent792e373519087ced0144f6eb0f219abbec6dbddf (diff)
downloaddrakx-backup-do-not-use-60977c62dfd825cf1414a7eb395b0be53532c6dc.tar
drakx-backup-do-not-use-60977c62dfd825cf1414a7eb395b0be53532c6dc.tar.gz
drakx-backup-do-not-use-60977c62dfd825cf1414a7eb395b0be53532c6dc.tar.bz2
drakx-backup-do-not-use-60977c62dfd825cf1414a7eb395b0be53532c6dc.tar.xz
drakx-backup-do-not-use-60977c62dfd825cf1414a7eb395b0be53532c6dc.zip
add support ADIModem.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/ethernet.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index d403f5094..9458eb292 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -130,6 +130,7 @@ sub conf_network_card_backend {
#-type =static or dhcp
if (!$interface) {
my @all_cards = detect_devices::getNet();
+ my @unconfigured_interfaces = qw(ADIModem);
my @devs = detect_devices::pcmcia_probe();
modules::mergein_conf("$prefix/etc/modules.conf");
@@ -143,8 +144,8 @@ sub conf_network_card_backend {
}
$a ||= $b;
$a and $saved_driver = $a;
- [$interface, $saved_driver];
- } @all_cards;
+ if_(!member($interface, @unconfigured_interfaces) || $a, [$interface, $saved_driver]);
+ } @all_cards, @unconfigured_interfaces;
}
my ($device) = $interface =~ /(ADIModem|eth[0-9]+)/ or die("the interface is not an ethx or other (like ADIModem)");
$netc->{NET_DEVICE} = $device; #- one consider that there is only ONE Internet connection device..