summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjlam <jlam>2001-11-21 21:38:50 +0000
committerjlam <jlam>2001-11-21 21:38:50 +0000
commite1cbd0b961bfde35229e14b6d3c90e589503c1ef (patch)
tree62d19c3fd37e1ac0c17df9885582a76d4eab225f /www
parent556710e5fadc5f77b89c26602bfd5dcf7f21198a (diff)
downloadpkgsrc-e1cbd0b961bfde35229e14b6d3c90e589503c1ef.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 'www')
-rw-r--r--www/thttpd/files/thttpd.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/www/thttpd/files/thttpd.sh b/www/thttpd/files/thttpd.sh
index d5ffb3848c1..61af6bf0f4a 100644
--- a/www/thttpd/files/thttpd.sh
+++ b/www/thttpd/files/thttpd.sh
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $NetBSD: thttpd.sh,v 1.5 2001/11/19 16:23:17 jlam Exp $
+# $NetBSD: thttpd.sh,v 1.6 2001/11/21 21:38:55 jlam Exp $
#
# PROVIDE: thttpd
# REQUIRE: DAEMON
-if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+if [ -e /etc/rc.subr ]
then
. /etc/rc.subr
fi
@@ -16,11 +16,11 @@ command=@PREFIX@/sbin/${name}
command_args="-C @CONFDIR@/${name}.conf"
required_files="@CONFDIR@/${name}.conf"
-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} ${thttpd_flags} ${command_args}
+ ${command} ${thttpd_flags} ${command_args}
fi
-
-load_rc_config $name
-run_rc_command "$1"