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
This commit is contained in:
parent
da12fc2370
commit
14dba5fc90
@ -11,12 +11,20 @@
|
|||||||
. /etc/rc.subr
|
. /etc/rc.subr
|
||||||
|
|
||||||
name="hcsecd"
|
name="hcsecd"
|
||||||
config="${hcsecd_config:-/etc/bluetooth/${name}.conf}"
|
|
||||||
command="/usr/sbin/${name}"
|
command="/usr/sbin/${name}"
|
||||||
command_args="-f ${config}"
|
|
||||||
pidfile="/var/run/${name}.pid"
|
pidfile="/var/run/${name}.pid"
|
||||||
required_files="${config}"
|
|
||||||
rcvar=`set_rcvar`
|
rcvar=`set_rcvar`
|
||||||
|
start_cmd="hcsecd_start"
|
||||||
|
|
||||||
|
hcsecd_start()
|
||||||
|
{
|
||||||
|
kldload ng_btsocket > /dev/null 2>&1
|
||||||
|
${command} ${command_args}
|
||||||
|
}
|
||||||
|
|
||||||
load_rc_config $name
|
load_rc_config $name
|
||||||
|
config="${hcsecd_config:-/etc/bluetooth/${name}.conf}"
|
||||||
|
command_args="-f ${config}"
|
||||||
|
required_files="${config}"
|
||||||
|
|
||||||
run_rc_command "$1"
|
run_rc_command "$1"
|
||||||
|
@ -11,12 +11,20 @@
|
|||||||
. /etc/rc.subr
|
. /etc/rc.subr
|
||||||
|
|
||||||
name="sdpd"
|
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}"
|
control="${sdpd_control:-/var/run/sdp}"
|
||||||
group="${sdpd_group:-nobody}"
|
group="${sdpd_group:-nobody}"
|
||||||
user="${sdpd_user:-nobody}"
|
user="${sdpd_user:-nobody}"
|
||||||
command="/usr/sbin/${name}"
|
|
||||||
command_args="-c ${control} -g ${group} -u ${user}"
|
command_args="-c ${control} -g ${group} -u ${user}"
|
||||||
rcvar=`set_rcvar`
|
|
||||||
|
|
||||||
load_rc_config $name
|
|
||||||
run_rc_command "$1"
|
run_rc_command "$1"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user