From 48960073093f0e6629e644e6bb31848eeaaf0860 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 25 Apr 2012 16:38:19 +0000 Subject: (ask_driver) do not try to access the full chroot path when running in chroot (mga#56052) still need to look at #26046 and #44416 --- lib/network/ndiswrapper.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/network/ndiswrapper.pm') diff --git a/lib/network/ndiswrapper.pm b/lib/network/ndiswrapper.pm index d626770..136f206 100644 --- a/lib/network/ndiswrapper.pm +++ b/lib/network/ndiswrapper.pm @@ -41,7 +41,9 @@ sub ask_driver { require run_program; -d $::prefix . "$ndiswrapper_root/$driver" and run_program::rooted($::prefix, 'ndiswrapper', '-e', $driver); - unless (run_program::rooted($::prefix, 'ndiswrapper', '-i', $inf_file)) { + my $rooted_path = $inf_file; + $rooted_path =~ s!^$::prefix!!; + unless (run_program::rooted($::prefix, 'ndiswrapper', '-i', $rooted_path)) { $in->ask_warn(N("Error"), N("Unable to install the %s ndiswrapper driver!", $driver)); return undef; } -- cgit v1.2.1