summaryrefslogtreecommitdiffstats
path: root/perl-install/printerdrake.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2002-01-28 23:19:40 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2002-01-28 23:19:40 +0000
commit8de8e2529e3f8742014d2a3fffb851eb036a9da9 (patch)
tree8f28274ec5016580d8eca7568662f98ce51b89ce /perl-install/printerdrake.pm
parent0da9a4e3256d2bd1e2351cdc06a26ab0d001cba5 (diff)
downloaddrakx-8de8e2529e3f8742014d2a3fffb851eb036a9da9.tar
drakx-8de8e2529e3f8742014d2a3fffb851eb036a9da9.tar.gz
drakx-8de8e2529e3f8742014d2a3fffb851eb036a9da9.tar.bz2
drakx-8de8e2529e3f8742014d2a3fffb851eb036a9da9.tar.xz
drakx-8de8e2529e3f8742014d2a3fffb851eb036a9da9.zip
Replaced "sleep" commands by a subroutine which waits exactly until CUPS is ready.
CUPS >= 1.1.12 needs to "know" all devices, let CUPS restart if a device is not "known" to it.
Diffstat (limited to 'perl-install/printerdrake.pm')
-rw-r--r--perl-install/printerdrake.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 87138b37b..c572a0e87 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -159,7 +159,6 @@ Normally, CUPS is automatically configured according to your network environment
$_ } @cupsd_conf;
}
printer::write_cupsd_conf(@cupsd_conf);
- sleep 3;
}
# Set auto-configuration state
if ($autoconf != $oldautoconf) {
@@ -344,6 +343,13 @@ _(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1
$device = $menuchoice;
}
+ #- if CUPS is the spooler, make sure that CUPS knows the device
+ if ($printer->{SPOOLER} eq "cups") {
+ my $w = $in->wait_message
+ ('', _("Making printer port available for CUPS ..."));
+ printer::assure_device_is_available_for_cups($device);
+ }
+
#- make the DeviceURI from $device.
$printer->{currentqueue}{'connect'} = "file:" . $device;
@@ -2004,7 +2010,6 @@ sub main {
# is shown directly after having done an operation.
$menushown = 1;
# Initialize the cursor position
- #print "##### |$cursorpos|$printer->{DEFAULT}|\n";
if (($cursorpos eq "::") &&
($printer->{DEFAULT}) &&
($printer->{DEFAULT} ne "")) {