From b0ceee58f4bc52935a0c58b2ea1f5ad53a799b69 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 17 Sep 2004 03:51:31 +0000 Subject: (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 ...) --- perl-install/network/ethernet.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'perl-install/network/ethernet.pm') 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]); + } } } -- cgit v1.2.1