summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-02-08 16:58:25 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-02-08 16:58:25 +0000
commit83bd8a22cff8a30ab61dc5ab9edfc6e0297f95b7 (patch)
tree3363a054eaa4a0aafff0089893d2049c6d88e9ba /perl-install
parent7978b0a3ffe13c32afe5ab97f56930303b2b5588 (diff)
downloaddrakx-backup-do-not-use-83bd8a22cff8a30ab61dc5ab9edfc6e0297f95b7.tar
drakx-backup-do-not-use-83bd8a22cff8a30ab61dc5ab9edfc6e0297f95b7.tar.gz
drakx-backup-do-not-use-83bd8a22cff8a30ab61dc5ab9edfc6e0297f95b7.tar.bz2
drakx-backup-do-not-use-83bd8a22cff8a30ab61dc5ab9edfc6e0297f95b7.tar.xz
drakx-backup-do-not-use-83bd8a22cff8a30ab61dc5ab9edfc6e0297f95b7.zip
Fixed (worked around?) bug of parallel HP MF devices not being set up correctly with HPOJ (probably bad interaction with udev).
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/printer/main.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index 30c2ef8ea..3d78ebfbd 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -2379,8 +2379,10 @@ sub configure_hpoj {
# (kernel mode with "printer"/"usblp" module for USB).
run_program::rooted($::prefix,
"ptal-mlcd", "$bus:probe",
- "-device",
- $device, split(' ',$address_arg));
+ (($bus ne "par") ||
+ (!$address_arg) ?
+ ("-device", $device) : ()),
+ split(' ',$address_arg));
} else {
# Start ptal-mlcd daemon for user-mode USB devices
# (all LIDIL MF devices as HP PSC 1xxx and OfficeJet
@@ -2566,7 +2568,8 @@ init.version=2
# because ptal-mlcd currently does no globbing:
print $CONFIG "-device /dev/usb/lp0 /dev/usb/lp1 /dev/usb/lp2 /dev/usb/lp3 /dev/usb/lp4 /dev/usb/lp5 /dev/usb/lp6 /dev/usb/lp7 /dev/usb/lp8 /dev/usb/lp9 /dev/usb/lp10 /dev/usb/lp11 /dev/usb/lp12 /dev/usb/lp13 /dev/usb/lp14 /dev/usb/lp15";
} elsif ($bus eq "par") {
- print $CONFIG "$address_arg -device $device";
+ print $CONFIG "$address_arg" .
+ (!$address_arg ? " -device $device" : "");
}
print $CONFIG "\n" .
"\n" .