diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-09-21 18:02:48 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-09-21 18:02:48 +0000 |
| commit | 6d6219bc192018918e6660afe83093301f968b69 (patch) | |
| tree | 34f317a9d230d1f3e9daaf613db2be60aaa0fc58 | |
| parent | a57d96056493854fe2a90e1ffcaf5c3ca63248b1 (diff) | |
| download | drakx-backup-do-not-use-6d6219bc192018918e6660afe83093301f968b69.tar drakx-backup-do-not-use-6d6219bc192018918e6660afe83093301f968b69.tar.gz drakx-backup-do-not-use-6d6219bc192018918e6660afe83093301f968b69.tar.bz2 drakx-backup-do-not-use-6d6219bc192018918e6660afe83093301f968b69.tar.xz drakx-backup-do-not-use-6d6219bc192018918e6660afe83093301f968b69.zip | |
no_comment
| -rw-r--r-- | perl-install/detect_devices.pm | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index dc9f17de2..e3b70cfff 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -167,15 +167,9 @@ sub getDAC960() { } sub getNet() { - my @nets = grep { hasNetDevice($_) } @netdevices; - $::isStandalone ? grep { !/plip/ } @nets : @nets; + grep { !($::isStandalone && /plip/) && c::hasNetDevice($_) } @netdevices; } -sub hasNet() { goto &getNet } -sub hasEthernet() { hasNetDevice("eth0"); } -sub hasTokenRing() { hasNetDevice("tr0"); } -sub hasNetDevice($) { c::hasNetDevice($_[0]) } - # pci_probing::main::probe with $probe_type is unsafe for pci! (bug in kernel&hardware) # get_pcmcia_devices provides field "device", used in network.pm # => probeall with $probe_type is unsafe |