summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-17 03:51:31 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-17 03:51:31 +0000
commitb0ceee58f4bc52935a0c58b2ea1f5ad53a799b69 (patch)
tree15f8e92b8bc3e5a0c90342fb94ed7f36ee465f7d
parentf7fc35971fc94dab801f40045c4262a75fda6321 (diff)
downloaddrakx-backup-do-not-use-b0ceee58f4bc52935a0c58b2ea1f5ad53a799b69.tar
drakx-backup-do-not-use-b0ceee58f4bc52935a0c58b2ea1f5ad53a799b69.tar.gz
drakx-backup-do-not-use-b0ceee58f4bc52935a0c58b2ea1f5ad53a799b69.tar.bz2
drakx-backup-do-not-use-b0ceee58f4bc52935a0c58b2ea1f5ad53a799b69.tar.xz
drakx-backup-do-not-use-b0ceee58f4bc52935a0c58b2ea1f5ad53a799b69.zip
(configure_eth_aliases) don't write aliases for pcmcia cards but
remove them, or else the pcmcia service won't be started correctly (the ethernet module being loaded, pcmcia_core would be loaded too, and the pcmcia service would think it is already started ...)
-rw-r--r--perl-install/network/ethernet.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 1a84e48a5..114fe2f27 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -118,8 +118,14 @@ sub update_iftab() {
# automatic net aliases configuration
sub configure_eth_aliases {
my ($modules_conf) = @_;
+ my @pcmcia = detect_devices::pcmcia_probe();
foreach my $card (get_eth_cards($modules_conf)) {
- $modules_conf->set_alias($card->[0], $card->[1]);
+ if (any { $_->{device} eq $card->[0] } @pcmcia) {
+ #- don't write aliases for pcmcia cards, or cardmgr won't be loaded
+ $modules_conf->remove_alias($card->[0]);
+ } else {
+ $modules_conf->set_alias($card->[0], $card->[1]);
+ }
}
}