diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-02-10 10:55:47 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-02-10 10:55:47 +0000 |
| commit | 1fc428dbeb71c4b0dc34fe0ec4b7ec29304b5b43 (patch) | |
| tree | c521843aacebaaa46196a353219b39e200e8f6a6 | |
| parent | 2b59ac07ffcce24283fb634538192d0a44f3d586 (diff) | |
| download | drakx-1fc428dbeb71c4b0dc34fe0ec4b7ec29304b5b43.tar drakx-1fc428dbeb71c4b0dc34fe0ec4b7ec29304b5b43.tar.gz drakx-1fc428dbeb71c4b0dc34fe0ec4b7ec29304b5b43.tar.bz2 drakx-1fc428dbeb71c4b0dc34fe0ec4b7ec29304b5b43.tar.xz drakx-1fc428dbeb71c4b0dc34fe0ec4b7ec29304b5b43.zip | |
fix ndiswrapper installing: always install it if needed (btw run faster if
already installed)
| -rw-r--r-- | perl-install/network/netconnect.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 0406571dc..b4246a0de 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -1068,11 +1068,13 @@ notation (for example, 1.2.3.4).")), list => [ N("Install a new driver"), N("Use already installed driver (%s)", join(", ", network::tools::ndiswrapper_installed_drivers())) ] } ]; }, complete => sub { + if ($in->do_pkgs->ensure_is_installed_if_available('ndiswrapper', '/usr/sbin/ndiswrapper')) { + $in->ask_warn(N("Error"), N("Could not install the %s package!")); + return 1; + }; if ($ndiswrapper_driver eq N("Install a new driver")) { if ($ndiswrapper_inf_file = $in->ask_file(N("Please select the Windows driver (.inf file)"), "/mnt/cdrom")) { - if ($in->do_pkgs->install("ndiswrapper")) { return system("ndiswrapper -i $ndiswrapper_inf_file"); - } } return 1; } |