From 3afbecfca542ccc56fca8eedb8b40a674bf2f0c0 Mon Sep 17 00:00:00 2001 From: emax Date: Tue, 22 Nov 2005 18:51:43 +0000 Subject: Revise hcsecd(8) and sdpd(8) rc.d scripts one more time - Use _prestart rc.d method to automatically kldload ng_btsocket(4) if needed; - Rename "sdpd_user" to "sdpd_username" and "sdpd_group" to "sdpd_groupname" to avoid collision with "magic" variables; Inspired by: yar MFC after: 3 days --- etc/rc.d/sdpd | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'etc/rc.d/sdpd') diff --git a/etc/rc.d/sdpd b/etc/rc.d/sdpd index c4d396c..7d1baf8 100644 --- a/etc/rc.d/sdpd +++ b/etc/rc.d/sdpd @@ -13,18 +13,26 @@ name="sdpd" command="/usr/sbin/${name}" rcvar=`set_rcvar` -start_cmd="sdpd_start" +start_precmd="sdpd_prestart" -sdpd_start() +sdpd_prestart() { - kldload ng_btsocket > /dev/null 2>&1 - ${command} ${command_args} + if ! kldstat -q -m ng_btsocket > /dev/null 2>&1 ; then + if kldload ng_btsocket > /dev/null 2>&1 ; then + info 'ng_btsocket module loaded' + else + warn 'ng_btsocket module failed to load' + return 1 + fi + fi + + return 0 } load_rc_config $name control="${sdpd_control:-/var/run/sdp}" -group="${sdpd_group:-nobody}" -user="${sdpd_user:-nobody}" +group="${sdpd_groupname:-nobody}" +user="${sdpd_username:-nobody}" command_args="-c ${control} -g ${group} -u ${user}" run_rc_command "$1" -- cgit v1.1