diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2002-08-24 02:27:49 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2002-08-24 02:27:49 +0000 |
| commit | c68bb9af0fcd0f7fa5a687b0f4f646d754658730 (patch) | |
| tree | 60bb512a3f76da70786bd059b98a8e72ab2e3d16 /perl-install/printerdrake.pm | |
| parent | 4d648af763963841846d1454956240db9f218a10 (diff) | |
| download | drakx-backup-do-not-use-c68bb9af0fcd0f7fa5a687b0f4f646d754658730.tar drakx-backup-do-not-use-c68bb9af0fcd0f7fa5a687b0f4f646d754658730.tar.gz drakx-backup-do-not-use-c68bb9af0fcd0f7fa5a687b0f4f646d754658730.tar.bz2 drakx-backup-do-not-use-c68bb9af0fcd0f7fa5a687b0f4f646d754658730.tar.xz drakx-backup-do-not-use-c68bb9af0fcd0f7fa5a687b0f4f646d754658730.zip | |
Let command line tools for network scanning run under "chroot $refix", otherwise they take ages during installation.
Moved network scanning functions from "detect_devices.pm" to "printer.pm" so that they have access to the "$prefix" variable.
Diffstat (limited to 'perl-install/printerdrake.pm')
| -rw-r--r-- | perl-install/printerdrake.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index 95a64750b..00b4bbab7 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -164,7 +164,9 @@ sub auto_detect { } my $b = before_leaving { eval { modules::unload("parport_probe") } } if $local; - detect_devices::whatPrinter($local, $network, $smb); + my @res = (($local ? detect_devices::whatPrinter() : ()), + ($network || $smb ? printer::whatNetPrinter($network,$smb) : ())); + @res; } sub wizard_welcome { |