From cc767fa9b70b981f639114b755dd8165fa8b9dc2 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 28 May 2003 09:01:02 +0000
Subject: Check and set the default settings in the right place (after
 /etc/rc.conf is loaded), and use "run_rc_command" instead of directly
 invoking $0 as the latter doesn't work at system startup.

---
 print/cups/files/cupsd.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'print/cups')

diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh
index 2ccbe3259f3..f900b669ddf 100644
--- a/print/cups/files/cupsd.sh
+++ b/print/cups/files/cupsd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: cupsd.sh,v 1.15 2003/01/23 23:05:11 jlam Exp $
+# $NetBSD: cupsd.sh,v 1.16 2003/05/28 09:01:02 jlam Exp $
 #
 # Common UNIX Printing System daemon
 #
@@ -31,13 +31,10 @@ extra_commands="reload wait"
 wait_cmd="cupsd_waitcmd"
 start_postcmd="cupsd_poststart"
 
-[ -z "${cupsd_wait}" ] && cupsd_wait=NO
-[ -z "${cupsd_timeout}" ] && cupsd_timeout=60
-
 cupsd_poststart()
 {
 	if checkyesno cupsd_wait; then
-		$0 wait
+		run_rc_command wait
 	fi
 }
 
@@ -69,6 +66,8 @@ cupsd_waitcmd()
 if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
+	[ -z "${cupsd_wait}" ] && cupsd_wait=NO
+	[ -z "${cupsd_timeout}" ] && cupsd_timeout=60
 	run_rc_command "$1"
 else
 	@ECHO@ -n " ${name}"
-- 
cgit v1.2.3