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

1 files changed, 12 insertions, 4 deletions

diff --git a/etc/rc.d/hcsecd b/etc/rc.d/hcsecd
index 69f2bb4..580b693 100644
--- a/etc/rc.d/hcsecd
+++ b/etc/rc.d/hcsecd
@@ -14,12 +14,20 @@ name="hcsecd"
 command="/usr/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 rcvar=`set_rcvar`
-start_cmd="hcsecd_start"
+start_precmd="hcsecd_prestart"
 
-hcsecd_start()
+hcsecd_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