diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-10-16 17:15:20 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-10-16 17:15:20 +0000 |
| commit | 45e42d612c3dd070392948c66d833f752fdc7737 (patch) | |
| tree | 40b250489b3514c8f8d201a0004309d3824704a7 | |
| parent | 750ae1cff2d0df07cb1cb9a00bf07996e4593689 (diff) | |
| download | drakx-45e42d612c3dd070392948c66d833f752fdc7737.tar drakx-45e42d612c3dd070392948c66d833f752fdc7737.tar.gz drakx-45e42d612c3dd070392948c66d833f752fdc7737.tar.bz2 drakx-45e42d612c3dd070392948c66d833f752fdc7737.tar.xz drakx-45e42d612c3dd070392948c66d833f752fdc7737.zip | |
- fix drakconnect logic regarding hotplug (hotplug being a binary
boolean and MII_NOT_SUPPORTED being a string)
- default to enabled network hotplug bug if the card is blacklisted
else rely on user provided value
- blacklist bcm4400 for hp
| -rw-r--r-- | perl-install/network/network.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index c9ef6f688..3b6b46c10 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -337,7 +337,10 @@ notation (for example, 1.2.3.4)."); my $auto_ip = $intf->{BOOTPROTO} !~ /static/; my $onboot = $intf->{ONBOOT} ? $intf->{ONBOOT} =~ /yes/ : bool2yesno(!member($intf->{DEVICE}, map { $_->{device} } detect_devices::pcmcia_probe())); my $needhostname = $intf->{NEEDHOSTNAME} !~ /no/; - my $hotplug = $::isStandalone && !$intf->{MII_NOT_SUPPORTED} || 1; + # blacklist: + $intf->{MII_NOT_SUPPORTED} ||= bool2yesno(member($module, qw(bcm4400))); # 3c59x de4x5 e100 e1000 ne2k-pci + my $hotplug = text2bool($intf->{MII_NOT_SUPPORTED}); + invbool(\$hotplug); my $track_network_id = $::isStandalone && $intf->{HWADDR} || detect_devices::isLaptop(); delete $intf->{NETWORK}; delete $intf->{BROADCAST}; |