summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2000-09-21 16:54:00 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2000-09-21 16:54:00 +0000
commit80b73550aa06653abdbeddf84445040629954afd (patch)
tree45cbb35deee8a3d5a8109157fe02608a98203c69
parent24cd617785c1cdd511bd4cfa10b1bae64465365c (diff)
downloaddrakx-backup-do-not-use-80b73550aa06653abdbeddf84445040629954afd.tar
drakx-backup-do-not-use-80b73550aa06653abdbeddf84445040629954afd.tar.gz
drakx-backup-do-not-use-80b73550aa06653abdbeddf84445040629954afd.tar.bz2
drakx-backup-do-not-use-80b73550aa06653abdbeddf84445040629954afd.tar.xz
drakx-backup-do-not-use-80b73550aa06653abdbeddf84445040629954afd.zip
really remove plip in standalone
-rw-r--r--perl-install/ChangeLog4
-rw-r--r--perl-install/detect_devices.pm5
2 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 79fea39cf..1c20bf887 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-21 Guillaume Cottenceau <gc@mandrakesoft.com>
+
+ * detect_devices.pm (getNet()): really remove plip in standalone
+
2000-09-21 François Pons <fpons@mandrakesoft.com>
* install_steps.pm, netconnect.pm: changed NETWORKING reference
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index be6ba24d6..dc9f17de2 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -14,7 +14,7 @@ use c;
#-#####################################################################################
#- Globals
#-#####################################################################################
-my @netdevices = map { my $l = $_; map { "$l$_" } (0..3) } (qw(eth tr fddi), $::isStandalone ? () : 'plip');
+my @netdevices = map { my $l = $_; map { "$l$_" } (0..3) } qw(eth tr fddi plip);
my %serialprobe = ();
my $usb_interface = undef;
@@ -167,7 +167,8 @@ sub getDAC960() {
}
sub getNet() {
- grep { hasNetDevice($_) } @netdevices;
+ my @nets = grep { hasNetDevice($_) } @netdevices;
+ $::isStandalone ? grep { !/plip/ } @nets : @nets;
}
sub hasNet() { goto &getNet }