diff options
| author | jlam <jlam@pkgsrc.org> | 2001-11-21 21:38:50 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-11-21 21:38:50 +0000 |
| commit | 892b322f451ae5245d6e3c85a919169078fde83f (patch) | |
| tree | 62d19c3fd37e1ac0c17df9885582a76d4eab225f /print | |
| parent | 878e9eaf6acb17ac0eb0bac6ac0ab8bf8008f158 (diff) | |
| download | pkgsrc-892b322f451ae5245d6e3c85a919169078fde83f.tar.gz | |
These rc.d scripts are copied to ${RCD_SCRIPTS_DIR} == /etc/rc.d, so change
the test for pre-rc.d systems to just whether /etc/rc.subr is present.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/files/cupsd.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh index 1274fe6db0d..cd438d6c432 100644 --- a/print/cups/files/cupsd.sh +++ b/print/cups/files/cupsd.sh @@ -1,13 +1,13 @@ #! /bin/sh # -# $NetBSD: cupsd.sh,v 1.6 2001/11/21 15:35:09 jlam Exp $ +# $NetBSD: cupsd.sh,v 1.7 2001/11/21 21:38:54 jlam Exp $ # # Common UNIX Printing System daemon # # PROVIDE: cupsd # REQUIRE: DAEMON -if [ -d /etc/rc.d -a -f /etc/rc.subr ] +if [ -e /etc/rc.subr ] then . /etc/rc.subr fi @@ -18,11 +18,11 @@ command="@PREFIX@/sbin/${name}" required_files="@CONFDIR@/cups/${name}.conf" extra_commands="reload" -if [ ! -d /etc/rc.d ] +if [ -e /etc/rc.subr ] then + load_rc_config $name + run_rc_command "$1" +else @ECHO@ -n " ${name}" - exec ${command} ${cupsd_flags} ${command_args} + ${command} ${cupsd_flags} ${command_args} fi - -load_rc_config $name -run_rc_command "$1" |