diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-04-20 15:30:22 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-04-20 15:30:22 +0000 |
| commit | b71b703d8beb7229dd7b9fc535b28e2875b433d0 (patch) | |
| tree | c2f5d54a25719a1ace38827d529e689411a4c73f | |
| parent | cec1caabb3b0813476b716390442c49b27b65105 (diff) | |
| download | drakx-backup-do-not-use-b71b703d8beb7229dd7b9fc535b28e2875b433d0.tar drakx-backup-do-not-use-b71b703d8beb7229dd7b9fc535b28e2875b433d0.tar.gz drakx-backup-do-not-use-b71b703d8beb7229dd7b9fc535b28e2875b433d0.tar.bz2 drakx-backup-do-not-use-b71b703d8beb7229dd7b9fc535b28e2875b433d0.tar.xz drakx-backup-do-not-use-b71b703d8beb7229dd7b9fc535b28e2875b433d0.zip | |
unload ndiswrapper first so that the newly installed .inf files will be read
redetect interfaces after ndiswrapper setup (so that the ndiswrapper module can be detected)
| -rw-r--r-- | perl-install/network/netconnect.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 24c848ba1..86d0ff2e3 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -1150,7 +1150,12 @@ notation (for example, 1.2.3.4).")), my $eth = find { $_->[0] eq $ntf_name } @all_cards; $ntf_name and modules::unload($eth->[1]); } - modules::load("ndiswrapper"); + #- unload ndiswrapper first so that the newly installed .inf files will be read + eval { modules::unload("ndiswrapper") }; + eval { modules::load("ndiswrapper") }; + + #- redetect interfaces (so that the ndiswrapper module can be detected) + $lan_detect->(); #- FIXME: move this somewhere in get_eth_cards, so that configure_eth_aliases correctly writes ndiswrapper #- find the first interface matching an ndiswrapper driver, try ethtool then sysfs |