summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-09-02 21:40:20 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-09-02 21:40:20 +0000
commit474ef6367025b193d13a29f650cd5a1c920c2c91 (patch)
tree8907da828ca0b393232689ee42604ca51c3026f3
parent45e3ef6d5bde29d75fbd832d09ed7a4b1215d7bf (diff)
downloaddrakx-474ef6367025b193d13a29f650cd5a1c920c2c91.tar
drakx-474ef6367025b193d13a29f650cd5a1c920c2c91.tar.gz
drakx-474ef6367025b193d13a29f650cd5a1c920c2c91.tar.bz2
drakx-474ef6367025b193d13a29f650cd5a1c920c2c91.tar.xz
drakx-474ef6367025b193d13a29f650cd5a1c920c2c91.zip
- Check for CUPS daemon running without console output.
-rw-r--r--perl-install/printer/services.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/printer/services.pm b/perl-install/printer/services.pm
index adb2587fe..f94cc5af5 100644
--- a/perl-install/printer/services.pm
+++ b/perl-install/printer/services.pm
@@ -45,7 +45,9 @@ sub wait_for_cups() {
my $cupsready = 0;
my $i;
for ($i = 0; $i < 30; $i++) {
- run_program::rooted($::prefix, "/usr/bin/lpstat", "-r");
+ # Check whether CUPS is running without any console output
+ system(($::testing ? $::prefix : "chroot $::prefix/ ") .
+ "/usr/bin/lpstat -r >/dev/null 2>&1");
if (($? >> 8) != 0) {
# CUPS is not ready, continue
sleep 1;