diff options
Diffstat (limited to 'sysutils/cbsd/files')
| -rw-r--r-- | sysutils/cbsd/files/cbsd-statsd-hoster.in | 13 | ||||
| -rw-r--r-- | sysutils/cbsd/files/cbsdd.in | 9 |
2 files changed, 17 insertions, 5 deletions
diff --git a/sysutils/cbsd/files/cbsd-statsd-hoster.in b/sysutils/cbsd/files/cbsd-statsd-hoster.in index ae09eaae83ff..730898d63964 100644 --- a/sysutils/cbsd/files/cbsd-statsd-hoster.in +++ b/sysutils/cbsd/files/cbsd-statsd-hoster.in @@ -24,7 +24,11 @@ restart_cmd=${name}_restart extra_commands="restart" command="%%PREFIX%%/cbsd/tools/racct-hoster-statsd" -pidfile="/var/run/$name.pid" +pidfile="/var/run/${name}.pid" +daemon_pidfile="/var/run/${name}-daemon.pid" +daemon_logdir="/var/log/${name}" +daemon_logfile="${daemon_logdir}/cbsd-statsd-hoster.log" + command_args="&" pidfile=/var/run/racct-hoster-statsd.pid @@ -40,7 +44,7 @@ if [ ! -f ${subr} ]; then fi . ${globalconf} -. ${subr} +. ${subrdir}/nc.subr cbsd_statsd_hoster_start() { @@ -84,7 +88,10 @@ cbsd_statsd_hoster_start() ;; esac - exec env workdir=${cbsd_workdir} %%PREFIX%%/cbsd/tools/racct-hoster-statsd ${args} + [ ! -d ${daemon_logdir} ] && mkdir -p ${daemon_logdir} + touch ${daemon_logfile} + + /usr/sbin/daemon -f -R5 -p ${pidfile} -P ${daemon_pidfile} -o ${daemon_logfile} /usr/bin/env workdir=${cbsd_workdir} ${command} ${args} } cbsd_statsd_hoster_restart() diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in index 7508dd6632bc..cbde5558a692 100644 --- a/sysutils/cbsd/files/cbsdd.in +++ b/sysutils/cbsd/files/cbsdd.in @@ -17,6 +17,11 @@ load_rc_config $name export workdir="${cbsd_workdir}" export NO_CBSD_HISTORY=yes +# disable interactive question +export NOINTER=1 +# always answer 'no' +export ALWAYS_NO=1 + globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"} if [ ! -f ${globalconf} ]; then @@ -41,7 +46,7 @@ fi . ${globalconf} . ${mdtools} -. ${subr} +. ${subrdir}/nc.subr . ${localcbsdconf} @@ -92,7 +97,7 @@ cbsdd_stop() cbsdd_restart() { if [ -f "${pidfile}" ]; then - pkill -9 -f ${pidfile} > /dev/null 2>&1 + pkill -9 -F ${pidfile} > /dev/null 2>&1 /bin/rm -f ${pidfile} fi run_rc_command "start" |