diff options
| author | jlam <jlam> | 2003-05-28 09:01:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-05-28 09:01:02 +0000 |
| commit | cc767fa9b70b981f639114b755dd8165fa8b9dc2 (patch) | |
| tree | 4e73f175377e31e46bd434b27d65f61aa9032649 /print/cups | |
| parent | 018397f3af19bf5feb9d4b2c1568afd9fc86adb0 (diff) | |
| download | pkgsrc-cc767fa9b70b981f639114b755dd8165fa8b9dc2.tar.gz | |
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.
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/files/cupsd.sh | 9 |
1 files changed, 4 insertions, 5 deletions
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}" |