diff options
Diffstat (limited to 'perl-install/printer/detect.pm')
| -rw-r--r-- | perl-install/printer/detect.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm index c1f4f3aaa..a117604cb 100644 --- a/perl-install/printer/detect.pm +++ b/perl-install/printer/detect.pm @@ -8,8 +8,12 @@ use printer::data; sub local_detect() { modules::any_conf->read->get_probeall("usb-interface") and eval { modules::load($usbprintermodule) }; - 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). + # Reload parallel port modules only when we were not called from the + # hotplug script, to avoid the hotplug script running recursively + if (!$::noX) { + 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). + } whatPrinter(); } |