summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2002-02-08 03:38:58 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2002-02-08 03:38:58 +0000
commit74be222fb54219e74f65e86c3ce782ab60f93aba (patch)
tree3f3460ab8664acea20a2a996d756a0482c609920
parent97c86a0dec95341aeb78a6e3e17e3007187ef336 (diff)
downloaddrakx-74be222fb54219e74f65e86c3ce782ab60f93aba.tar
drakx-74be222fb54219e74f65e86c3ce782ab60f93aba.tar.gz
drakx-74be222fb54219e74f65e86c3ce782ab60f93aba.tar.bz2
drakx-74be222fb54219e74f65e86c3ce782ab60f93aba.tar.xz
drakx-74be222fb54219e74f65e86c3ce782ab60f93aba.zip
CUPS 1.1.13 dies on SIGHUP, do normal restart instead.
-rw-r--r--perl-install/printer.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index a5b24ed92..afbb2852c 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -200,8 +200,13 @@ sub SIGHUP_daemon {
} else {
$daemon = $service;
}
- # Send the SIGHUP
- run_program::rooted($prefix, "/usr/bin/killall", "-HUP", $daemon);
+ if ($service eq "cups") {
+ # The current CUPS (1.1.13) dies on SIGHUP, to the normal restart.
+ restart_service($service);
+ } else {
+ # Send the SIGHUP
+ run_program::rooted($prefix, "/usr/bin/killall", "-HUP", $daemon);
+ }
# CUPS needs some time to come up.
if ($service eq "cups") {
wait_for_cups();