From b45e4c11dae28532856371231b995db62c00074e Mon Sep 17 00:00:00 2001
From: emax <emax@FreeBSD.org>
Date: Tue, 15 Nov 2005 20:36:26 +0000
Subject: Revise hcsecd(8) and sdpd(8) rc.d scripts.

- Have both scripts automatically kldload ng_btsocket(4). I did not want to
  do it, but its easier for users and it seems other scripts do similar things;

- Assign few variables after load_rc_config, so the /etc/rc.conf overrides
  actually work;

MFC after:	1 week
---
 etc/rc.d/hcsecd | 14 +++++++++++---
 etc/rc.d/sdpd   | 14 +++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/etc/rc.d/hcsecd b/etc/rc.d/hcsecd
index 445bf38..69f2bb4 100644
--- a/etc/rc.d/hcsecd
+++ b/etc/rc.d/hcsecd
@@ -11,12 +11,20 @@
 . /etc/rc.subr
 
 name="hcsecd"
-config="${hcsecd_config:-/etc/bluetooth/${name}.conf}"
 command="/usr/sbin/${name}"
-command_args="-f ${config}"
 pidfile="/var/run/${name}.pid"
-required_files="${config}"
 rcvar=`set_rcvar`
+start_cmd="hcsecd_start"
+
+hcsecd_start()
+{
+	kldload ng_btsocket > /dev/null 2>&1
+	${command} ${command_args}
+}
 
 load_rc_config $name
+config="${hcsecd_config:-/etc/bluetooth/${name}.conf}"
+command_args="-f ${config}"
+required_files="${config}"
+
 run_rc_command "$1"
diff --git a/etc/rc.d/sdpd b/etc/rc.d/sdpd
index dc0ab1d..c4d396c 100644
--- a/etc/rc.d/sdpd
+++ b/etc/rc.d/sdpd
@@ -11,12 +11,20 @@
 . /etc/rc.subr
 
 name="sdpd"
+command="/usr/sbin/${name}"
+rcvar=`set_rcvar`
+start_cmd="sdpd_start"
+
+sdpd_start()
+{
+	kldload ng_btsocket > /dev/null 2>&1
+	${command} ${command_args}
+}
+
+load_rc_config $name
 control="${sdpd_control:-/var/run/sdp}"
 group="${sdpd_group:-nobody}"
 user="${sdpd_user:-nobody}"
-command="/usr/sbin/${name}"
 command_args="-c ${control} -g ${group} -u ${user}"
-rcvar=`set_rcvar`
 
-load_rc_config $name
 run_rc_command "$1"
-- 
cgit v1.1