From 1fc428dbeb71c4b0dc34fe0ec4b7ec29304b5b43 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 10 Feb 2005 10:55:47 +0000 Subject: fix ndiswrapper installing: always install it if needed (btw run faster if already installed) --- perl-install/network/netconnect.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'perl-install/network') 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; } -- cgit v1.2.1