summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/main.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2004-02-14 04:29:30 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2004-02-14 04:29:30 +0000
commit3f00e6d14d872e59fd3998b874d9bf1bc627462f (patch)
treee30c3c354132bde49e69199e168e0ae16ac3c20f /perl-install/printer/main.pm
parentea18f4fa055bc224d956f9b626f60938b9c7e08d (diff)
downloaddrakx-3f00e6d14d872e59fd3998b874d9bf1bc627462f.tar
drakx-3f00e6d14d872e59fd3998b874d9bf1bc627462f.tar.gz
drakx-3f00e6d14d872e59fd3998b874d9bf1bc627462f.tar.bz2
drakx-3f00e6d14d872e59fd3998b874d9bf1bc627462f.tar.xz
drakx-3f00e6d14d872e59fd3998b874d9bf1bc627462f.zip
Let printerdrake load the "usblp" instead of the "printer" kernel module if kernel 2.6.x is used.
Diffstat (limited to 'perl-install/printer/main.pm')
-rw-r--r--perl-install/printer/main.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index f856902a2..1fa15d916 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -2242,7 +2242,7 @@ sub configure_hpoj {
if ($bus ne "hpjd") {
if (!$libusb) {
# Start ptal-mlcd daemon for locally connected devices
- # (kernel mode with "printer" module for USB).
+ # (kernel mode with "printer"/"usblp" module for USB).
run_program::rooted($::prefix,
"ptal-mlcd", "$bus:probe",
"-device",
@@ -2253,9 +2253,9 @@ sub configure_hpoj {
# 4xxx)
my $usbdev = usbdevice($_->{val});
if (defined($usbdev)) {
- # Unload kernel module "printer"
+ # Unload kernel module "printer"/"usblp"
if (modules::get_probeall("usb-interface")) {
- eval(modules::unload("printer"));
+ eval(modules::unload($usbprintermodule));
$printermoduleunloaded = 1;
}
# Start ptal-mlcd
@@ -2312,7 +2312,8 @@ sub configure_hpoj {
}
close F;
}
- $printermoduleunloaded && eval(modules::load("printer"));
+ $printermoduleunloaded &&
+ eval(modules::load($usbprintermodule));
}
last if $device_ok;
}