summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/detect.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-07-27 08:08:05 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-07-27 08:08:05 +0000
commitf4f246d4a12ce137e1e73b8c0d590da3d9337b5f (patch)
tree87fe6a5fff61ba70a489710837010150c7d203b6 /perl-install/printer/detect.pm
parent4cb36e102e377ddfd1cdd52d8edce3141518183e (diff)
downloaddrakx-backup-do-not-use-f4f246d4a12ce137e1e73b8c0d590da3d9337b5f.tar
drakx-backup-do-not-use-f4f246d4a12ce137e1e73b8c0d590da3d9337b5f.tar.gz
drakx-backup-do-not-use-f4f246d4a12ce137e1e73b8c0d590da3d9337b5f.tar.bz2
drakx-backup-do-not-use-f4f246d4a12ce137e1e73b8c0d590da3d9337b5f.tar.xz
drakx-backup-do-not-use-f4f246d4a12ce137e1e73b8c0d590da3d9337b5f.zip
- Started implementation of configurable, partially interactive print
queue auto setup.
Diffstat (limited to 'perl-install/printer/detect.pm')
-rw-r--r--perl-install/printer/detect.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index 065ac23e1..e114e00b5 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -8,9 +8,9 @@ use printer::data;
sub local_detect() {
modules::any_conf->read->get_probeall("usb-interface") and eval { modules::load($usbprintermodule) };
- # Reload parallel port modules only when we were not called from the
- # hotplug script, to avoid the hotplug script running recursively
- if (!$::noX) {
+ # Reload parallel port modules only when we were not called by
+ # automatic setup of print queues, to avoid recursive calls
+ if (!$::autoqueue) {
eval { modules::unload(qw(lp parport_pc parport)) }; #- on kernel 2.4 parport has to be unloaded to probe again
eval { modules::load(qw(parport_pc lp)) }; #- take care as not available on 2.4 kernel (silent error).
}