summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-03-06 14:41:05 +0000
committerFrancois Pons <fpons@mandriva.com>2003-03-06 14:41:05 +0000
commitdf2c3f5af42caa733f2a3a7e4bc870168334bd55 (patch)
tree0f868f25357659b14e934d6d55e59e069c84409b
parent3d6c51e4efe79b2ee8bef21fbc834b744cbffa5a (diff)
downloaddrakx-backup-do-not-use-df2c3f5af42caa733f2a3a7e4bc870168334bd55.tar
drakx-backup-do-not-use-df2c3f5af42caa733f2a3a7e4bc870168334bd55.tar.gz
drakx-backup-do-not-use-df2c3f5af42caa733f2a3a7e4bc870168334bd55.tar.bz2
drakx-backup-do-not-use-df2c3f5af42caa733f2a3a7e4bc870168334bd55.tar.xz
drakx-backup-do-not-use-df2c3f5af42caa733f2a3a7e4bc870168334bd55.zip
fixed ifconfig invocation and state analysis in install mode.
-rw-r--r--perl-install/network/ethernet.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 9528a9ed9..9dc6d9b1c 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -132,7 +132,7 @@ sub conf_network_card_backend {
my $saved_driver;
return map {
my $interface = $_;
- my $interface_state = `LC_ALL=C LANG=C LANGUAGE=C LC_MESSAGES=C /sbin/ifconfig "$interface"`;
+ my $interface_state = `LC_ALL=C LANG=C LANGUAGE=C LC_MESSAGES=C $prefix/sbin/ifconfig "$interface"`;
my $a = modules::get_alias($interface);
my $b;
foreach (@devs) {
@@ -140,8 +140,9 @@ sub conf_network_card_backend {
}
$a ||= $b;
$a and $saved_driver = $a;
- if_($interface_state =~ /inet addr|Bcast|Mask|Interrupt|Base address/ && $a, [$interface, $saved_driver]);
- } @all_cards, @unconfigured_interfaces;
+ if_($::isInstall || $interface_state =~ /inet addr|Bcast|Mask|Interrupt|Base address/ && $a,
+ [$interface, $saved_driver]);
+ } @all_cards;
}
$interface =~ /eth[0-9]+/ or die("the interface is not an ethx");