diff options
66 files changed, 70 insertions, 70 deletions
diff --git a/etc/rc.d/accounting b/etc/rc.d/accounting index 502ffe6..85483fe 100755 --- a/etc/rc.d/accounting +++ b/etc/rc.d/accounting @@ -11,7 +11,7 @@ . /etc/rc.subr name="accounting" -rcvar=`set_rcvar` +rcvar="accounting_enable" accounting_command="/usr/sbin/accton" accounting_file="/var/account/acct" diff --git a/etc/rc.d/amd b/etc/rc.d/amd index 8105aeb..e313f0c 100755 --- a/etc/rc.d/amd +++ b/etc/rc.d/amd @@ -11,7 +11,7 @@ . /etc/rc.subr name="amd" -rcvar=`set_rcvar` +rcvar="amd_enable" command="/usr/sbin/${name}" start_precmd="amd_precmd" command_args="&" diff --git a/etc/rc.d/apm b/etc/rc.d/apm index 3d15701..5633377 100755 --- a/etc/rc.d/apm +++ b/etc/rc.d/apm @@ -11,7 +11,7 @@ . /etc/rc.subr name="apm" -rcvar=`set_rcvar` +rcvar="apm_enable" start_precmd="apm_precmd" command="/usr/sbin/${name}" start_cmd="${command} -e enable" diff --git a/etc/rc.d/apmd b/etc/rc.d/apmd index c2d6967..2a326c1 100755 --- a/etc/rc.d/apmd +++ b/etc/rc.d/apmd @@ -11,7 +11,7 @@ . /etc/rc.subr name="apmd" -rcvar=`set_rcvar` +rcvar="apmd_enable" command="/usr/sbin/${name}" start_precmd="apmd_prestart" diff --git a/etc/rc.d/bootparams b/etc/rc.d/bootparams index 1081bbf..de77442 100755 --- a/etc/rc.d/bootparams +++ b/etc/rc.d/bootparams @@ -11,7 +11,7 @@ . /etc/rc.subr name="bootparamd" -rcvar=`set_rcvar` +rcvar="bootparamd_enable" required_files="/etc/bootparams" command="/usr/sbin/${name}" diff --git a/etc/rc.d/bsnmpd b/etc/rc.d/bsnmpd index c24a08f..2aad72e 100755 --- a/etc/rc.d/bsnmpd +++ b/etc/rc.d/bsnmpd @@ -10,7 +10,7 @@ . /etc/rc.subr name="bsnmpd" -rcvar=`set_rcvar` +rcvar="bsnmpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/snmpd.pid" diff --git a/etc/rc.d/bthidd b/etc/rc.d/bthidd index 907305e..7c5ccf3 100755 --- a/etc/rc.d/bthidd +++ b/etc/rc.d/bthidd @@ -11,9 +11,9 @@ . /etc/rc.subr name="bthidd" +rcvar="bthidd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" -rcvar=`set_rcvar` start_precmd="bthidd_prestart" bthidd_prestart() diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar index 490b5c5..62c8f42 100755 --- a/etc/rc.d/cleanvar +++ b/etc/rc.d/cleanvar @@ -9,7 +9,7 @@ . /etc/rc.subr name="cleanvar" -rcvar=`set_rcvar` +rcvar="cleanvar_enable" start_precmd="${name}_prestart" start_cmd="${name}_start" diff --git a/etc/rc.d/cleartmp b/etc/rc.d/cleartmp index 0d84987..94c421a 100755 --- a/etc/rc.d/cleartmp +++ b/etc/rc.d/cleartmp @@ -11,7 +11,7 @@ name="cleartmp" # Disguise rcvar for the start method to run irrespective of its setting. -rcvar1=`set_rcvar clear_tmp` +rcvar1="clear_tmp_enable" start_cmd="${name}_start" stop_cmd=":" diff --git a/etc/rc.d/cron b/etc/rc.d/cron index cc87d42..afc8df4 100755 --- a/etc/rc.d/cron +++ b/etc/rc.d/cron @@ -11,7 +11,7 @@ . /etc/rc.subr name="cron" -rcvar="`set_rcvar`" +rcvar="cron_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" diff --git a/etc/rc.d/ddb b/etc/rc.d/ddb index 51e24ea..86c5c99 100755 --- a/etc/rc.d/ddb +++ b/etc/rc.d/ddb @@ -11,7 +11,7 @@ . /etc/rc.subr name="ddb" -rcvar=`set_rcvar` +rcvar="ddb_enable" command="/sbin/${name}" start_precmd="ddb_prestart" stop_cmd=":" diff --git a/etc/rc.d/devd b/etc/rc.d/devd index e257da6..7a95684 100755 --- a/etc/rc.d/devd +++ b/etc/rc.d/devd @@ -11,7 +11,7 @@ . /etc/rc.subr name="devd" -rcvar=`set_rcvar` +rcvar="devd_enable" command="/sbin/${name}" start_precmd=${name}_prestart diff --git a/etc/rc.d/dmesg b/etc/rc.d/dmesg index c6cdca3..697cae9 100755 --- a/etc/rc.d/dmesg +++ b/etc/rc.d/dmesg @@ -11,7 +11,7 @@ . /etc/rc.subr name="dmesg" -rcvar=`set_rcvar` +rcvar="dmesg_enable" dmesg_file="/var/run/dmesg.boot" start_cmd="do_dmesg" stop_cmd=":" diff --git a/etc/rc.d/ftp-proxy b/etc/rc.d/ftp-proxy index 6712e68..1bb89dd 100755 --- a/etc/rc.d/ftp-proxy +++ b/etc/rc.d/ftp-proxy @@ -10,7 +10,7 @@ . /etc/rc.subr name="ftpproxy" -rcvar=`set_rcvar` +rcvar="ftpproxy_enable" command="/usr/sbin/ftp-proxy" load_rc_config $name diff --git a/etc/rc.d/ftpd b/etc/rc.d/ftpd index 338d735..c862586 100755 --- a/etc/rc.d/ftpd +++ b/etc/rc.d/ftpd @@ -10,7 +10,7 @@ . /etc/rc.subr name="ftpd" -rcvar=`set_rcvar` +rcvar="ftpd_enable" command="/usr/libexec/${name}" pidfile="/var/run/${name}.pid" start_precmd=ftpd_prestart diff --git a/etc/rc.d/gptboot b/etc/rc.d/gptboot index abfcaa1..a6cee68 100755 --- a/etc/rc.d/gptboot +++ b/etc/rc.d/gptboot @@ -34,7 +34,7 @@ . /etc/rc.subr name="gptboot" -rcvar=`set_rcvar` +rcvar="gptboot_enable" start_cmd="gptboot_report" gptboot_report() diff --git a/etc/rc.d/hastd b/etc/rc.d/hastd index b9d9516..534dc66 100755 --- a/etc/rc.d/hastd +++ b/etc/rc.d/hastd @@ -11,7 +11,7 @@ . /etc/rc.subr name="hastd" -rcvar=`set_rcvar` +rcvar="hastd_enable" pidfile="/var/run/${name}.pid" command="/sbin/${name}" hastctl="/sbin/hastctl" diff --git a/etc/rc.d/hcsecd b/etc/rc.d/hcsecd index fd6a925..691b14b 100755 --- a/etc/rc.d/hcsecd +++ b/etc/rc.d/hcsecd @@ -11,9 +11,9 @@ . /etc/rc.subr name="hcsecd" +rcvar="hcsecd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" -rcvar=`set_rcvar` required_modules="ng_btsocket" load_rc_config $name diff --git a/etc/rc.d/hostapd b/etc/rc.d/hostapd index 5f8203e..f65fcde 100755 --- a/etc/rc.d/hostapd +++ b/etc/rc.d/hostapd @@ -10,8 +10,8 @@ . /etc/rc.subr name="hostapd" +rcvar="hostapd_enable" command="/usr/sbin/${name}" -rcvar=`set_rcvar` conf_file="/etc/${name}.conf" pidfile="/var/run/${name}.pid" diff --git a/etc/rc.d/inetd b/etc/rc.d/inetd index fc00f38..d4e97ed 100755 --- a/etc/rc.d/inetd +++ b/etc/rc.d/inetd @@ -10,7 +10,7 @@ . /etc/rc.subr name="inetd" -rcvar=`set_rcvar` +rcvar="inetd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/${name}.conf" diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl index d38018c..c66a5ea 100755 --- a/etc/rc.d/ip6addrctl +++ b/etc/rc.d/ip6addrctl @@ -12,7 +12,7 @@ . /etc/network.subr name="ip6addrctl" -rcvar=`set_rcvar` +rcvar="ip6addrctl_enable" start_cmd="ip6addrctl_start" stop_cmd="ip6addrctl_stop" extra_commands="status prefer_ipv6 prefer_ipv4" diff --git a/etc/rc.d/ipfilter b/etc/rc.d/ipfilter index b6bdb4b..ec8e2f1 100755 --- a/etc/rc.d/ipfilter +++ b/etc/rc.d/ipfilter @@ -10,7 +10,7 @@ . /etc/rc.subr name="ipfilter" -rcvar=`set_rcvar` +rcvar="ipfilter_enable" load_rc_config $name stop_precmd="test -f ${ipfilter_rules} -o -f ${ipv6_ipfilter_rules}" diff --git a/etc/rc.d/ipfs b/etc/rc.d/ipfs index 9b5ccac..ff4c74d 100755 --- a/etc/rc.d/ipfs +++ b/etc/rc.d/ipfs @@ -10,7 +10,7 @@ . /etc/rc.subr name="ipfs" -rcvar=`set_rcvar` +rcvar="ipfs_enable" start_cmd="ipfs_start" stop_cmd="ipfs_stop" start_precmd="ipfs_prestart" diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon index cbed453..45e91fb 100755 --- a/etc/rc.d/ipmon +++ b/etc/rc.d/ipmon @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipmon" -rcvar=`set_rcvar` +rcvar="ipmon_enable" command="/sbin/${name}" start_precmd="ipmon_precmd" diff --git a/etc/rc.d/ipnat b/etc/rc.d/ipnat index 6bf2e08..a265916 100755 --- a/etc/rc.d/ipnat +++ b/etc/rc.d/ipnat @@ -10,7 +10,7 @@ . /etc/rc.subr name="ipnat" -rcvar=`set_rcvar` +rcvar="ipnat_enable" load_rc_config $name start_cmd="ipnat_start" stop_cmd="${ipnat_program} -F -C" diff --git a/etc/rc.d/ipsec b/etc/rc.d/ipsec index 0ad5490..c2e0b5f 100755 --- a/etc/rc.d/ipsec +++ b/etc/rc.d/ipsec @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipsec" -rcvar=`set_rcvar` +rcvar="ipsec_enable" start_precmd="ipsec_prestart" start_cmd="ipsec_start" stop_precmd="test -f $ipsec_file" diff --git a/etc/rc.d/ipxrouted b/etc/rc.d/ipxrouted index 04d3586..dcca91d 100755 --- a/etc/rc.d/ipxrouted +++ b/etc/rc.d/ipxrouted @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipxrouted" -rcvar=`set_rcvar` +rcvar="ipxrouted_enable" command="/usr/sbin/IPXrouted" command_args="> /dev/null 2>&1" diff --git a/etc/rc.d/jail b/etc/rc.d/jail index 09170bd..54cdee2 100755 --- a/etc/rc.d/jail +++ b/etc/rc.d/jail @@ -17,7 +17,7 @@ . /etc/rc.subr name="jail" -rcvar=`set_rcvar` +rcvar="jail_enable" start_precmd="jail_prestart" start_cmd="jail_start" diff --git a/etc/rc.d/keyserv b/etc/rc.d/keyserv index d1eaaee..84b169a 100755 --- a/etc/rc.d/keyserv +++ b/etc/rc.d/keyserv @@ -13,7 +13,7 @@ . /etc/rc.subr name="keyserv" -rcvar=`set_rcvar` +rcvar="keyserv_enable" command="/usr/sbin/${name}" start_precmd="keyserv_prestart" diff --git a/etc/rc.d/lpd b/etc/rc.d/lpd index 552e068..6a74267 100755 --- a/etc/rc.d/lpd +++ b/etc/rc.d/lpd @@ -11,7 +11,7 @@ . /etc/rc.subr name="lpd" -rcvar=`set_rcvar` +rcvar="lpd_enable" command="/usr/sbin/${name}" required_files="/etc/printcap" start_precmd="chkprintcap" diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd index 017418d..826a158 100755 --- a/etc/rc.d/mountd +++ b/etc/rc.d/mountd @@ -10,7 +10,7 @@ . /etc/rc.subr name="mountd" -rcvar=`set_rcvar` +rcvar="mountd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/exports" diff --git a/etc/rc.d/moused b/etc/rc.d/moused index fd2c447..6e71f44 100755 --- a/etc/rc.d/moused +++ b/etc/rc.d/moused @@ -10,7 +10,7 @@ . /etc/rc.subr name="moused" -rcvar=`set_rcvar` +rcvar="moused_enable" command="/usr/sbin/${name}" start_cmd="moused_start" pidprefix="/var/run/moused" @@ -23,7 +23,7 @@ load_rc_config $name # if [ -n "$2" ]; then eval moused_$2_enable=\${moused_$2_enable-${moused_nondefault_enable}} - rcvar=`set_rcvar moused_$2` + rcvar="moused_${2}_enable" pidfile="${pidprefix}.$2.pid" pidarg="-I $pidfile" fi diff --git a/etc/rc.d/mroute6d b/etc/rc.d/mroute6d index 047f241..1eb6eb4 100755 --- a/etc/rc.d/mroute6d +++ b/etc/rc.d/mroute6d @@ -11,7 +11,7 @@ . /etc/rc.subr name="mroute6d" -rcvar=`set_rcvar` +rcvar="mroute6d_enable" command="/usr/local/sbin/pim6dd" load_rc_config $name diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted index 2eb9144..b3c0918 100755 --- a/etc/rc.d/mrouted +++ b/etc/rc.d/mrouted @@ -10,7 +10,7 @@ . /etc/rc.subr name="mrouted" -rcvar=`set_rcvar` +rcvar="mrouted_enable" command="/usr/local/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/${name}.conf" diff --git a/etc/rc.d/natd b/etc/rc.d/natd index e22353a..35f17bb 100755 --- a/etc/rc.d/natd +++ b/etc/rc.d/natd @@ -10,7 +10,7 @@ . /etc/network.subr name="natd" -rcvar=`set_rcvar` +rcvar="natd_enable" command="/sbin/${name}" pidfile="/var/run/${name}.pid" start_precmd="natd_precmd" diff --git a/etc/rc.d/netwait b/etc/rc.d/netwait index 1d3556a..7ea7a4c 100755 --- a/etc/rc.d/netwait +++ b/etc/rc.d/netwait @@ -14,7 +14,7 @@ . /etc/rc.subr name="netwait" -rcvar=`set_rcvar` +rcvar="netwait_enable" start_cmd="${name}_start" stop_cmd=":" diff --git a/etc/rc.d/newsyslog b/etc/rc.d/newsyslog index ab8f2d3..5dc4066 100755 --- a/etc/rc.d/newsyslog +++ b/etc/rc.d/newsyslog @@ -9,7 +9,7 @@ . /etc/rc.subr name="newsyslog" -rcvar=`set_rcvar` +rcvar="newsyslog_enable" required_files="/etc/newsyslog.conf" command="/usr/sbin/${name}" start_cmd="newsyslog_start" diff --git a/etc/rc.d/nfscbd b/etc/rc.d/nfscbd index 8fecfe9..bfc4966 100755 --- a/etc/rc.d/nfscbd +++ b/etc/rc.d/nfscbd @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfscbd" -rcvar=`set_rcvar` +rcvar="nfscbd_enable" command="/usr/sbin/${name}" sig_stop="USR1" diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd index e1fd968..235a866 100755 --- a/etc/rc.d/nfsd +++ b/etc/rc.d/nfsd @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfsd" -rcvar=`set_rcvar nfs_server` +rcvar="nfs_server_enable" command="/usr/sbin/${name}" load_rc_config $name diff --git a/etc/rc.d/nfsuserd b/etc/rc.d/nfsuserd index 278c666..52246bb 100755 --- a/etc/rc.d/nfsuserd +++ b/etc/rc.d/nfsuserd @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfsuserd" -rcvar=`set_rcvar` +rcvar="nfsuserd_enable" command="/usr/sbin/${name}" sig_stop="USR1" diff --git a/etc/rc.d/nscd b/etc/rc.d/nscd index 42041a7..22c8459 100755 --- a/etc/rc.d/nscd +++ b/etc/rc.d/nscd @@ -19,7 +19,7 @@ . /etc/rc.subr name="nscd" -rcvar=`set_rcvar` +rcvar="nscd_enable" command=/usr/sbin/nscd extra_commands="flush" diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd index b7b009c..ef2f6d4 100755 --- a/etc/rc.d/ntpd +++ b/etc/rc.d/ntpd @@ -11,7 +11,7 @@ . /etc/rc.subr name="ntpd" -rcvar=`set_rcvar` +rcvar="ntpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" start_precmd="ntpd_precmd" diff --git a/etc/rc.d/ntpdate b/etc/rc.d/ntpdate index 3f93e27..4a8b845 100755 --- a/etc/rc.d/ntpdate +++ b/etc/rc.d/ntpdate @@ -10,7 +10,7 @@ . /etc/rc.subr name="ntpdate" -rcvar=`set_rcvar` +rcvar="ntpdate_enable" stop_cmd=":" start_cmd="ntpdate_start" diff --git a/etc/rc.d/pf b/etc/rc.d/pf index 3180a2c..8dcc40d 100755 --- a/etc/rc.d/pf +++ b/etc/rc.d/pf @@ -11,7 +11,7 @@ . /etc/rc.subr name="pf" -rcvar=`set_rcvar` +rcvar="pf_enable" load_rc_config $name start_cmd="pf_start" stop_cmd="pf_stop" diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog index 001ad38..e5511fc 100755 --- a/etc/rc.d/pflog +++ b/etc/rc.d/pflog @@ -10,7 +10,7 @@ . /etc/rc.subr name="pflog" -rcvar=`set_rcvar` +rcvar="pflog_enable" command="/sbin/pflogd" pidfile="/var/run/pflogd.pid" start_precmd="pflog_prestart" diff --git a/etc/rc.d/pfsync b/etc/rc.d/pfsync index 6c87517..fa89b30 100755 --- a/etc/rc.d/pfsync +++ b/etc/rc.d/pfsync @@ -10,7 +10,7 @@ . /etc/rc.subr name="pfsync" -rcvar=`set_rcvar` +rcvar="pfsync_enable" start_precmd="pfsync_prestart" start_cmd="pfsync_start" stop_cmd="pfsync_stop" diff --git a/etc/rc.d/powerd b/etc/rc.d/powerd index e59d979..84a260f 100755 --- a/etc/rc.d/powerd +++ b/etc/rc.d/powerd @@ -11,7 +11,7 @@ . /etc/rc.subr name="powerd" -rcvar=`set_rcvar` +rcvar="powerd_enable" command="/usr/sbin/${name}" stop_postcmd=powerd_poststop diff --git a/etc/rc.d/ppp b/etc/rc.d/ppp index 84d6bc4..4c3b377 100755 --- a/etc/rc.d/ppp +++ b/etc/rc.d/ppp @@ -10,7 +10,7 @@ . /etc/rc.subr name="ppp" -rcvar=`set_rcvar` +rcvar="ppp_enable" command="/usr/sbin/${name}" start_cmd="ppp_start" stop_cmd="ppp_stop" diff --git a/etc/rc.d/pppoed b/etc/rc.d/pppoed index c939112..b60fdaa 100755 --- a/etc/rc.d/pppoed +++ b/etc/rc.d/pppoed @@ -11,7 +11,7 @@ . /etc/rc.subr name="pppoed" -rcvar="`set_rcvar`" +rcvar="pppoed_enable" start_cmd="pppoed_start" # XXX stop_cmd will not be straightforward stop_cmd=":" diff --git a/etc/rc.d/quota b/etc/rc.d/quota index edc90ef..eceb283 100755 --- a/etc/rc.d/quota +++ b/etc/rc.d/quota @@ -13,7 +13,7 @@ . /etc/rc.subr name="quota" -rcvar=`set_rcvar` +rcvar="quota_enable" load_rc_config $name start_cmd="quota_start" stop_cmd="/usr/sbin/quotaoff ${quotaoff_flags}" diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd index 3602c87..db5f0c4 100755 --- a/etc/rc.d/rarpd +++ b/etc/rc.d/rarpd @@ -11,7 +11,7 @@ . /etc/rc.subr name="rarpd" -rcvar=`set_rcvar` +rcvar="rarpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/ethers" diff --git a/etc/rc.d/rfcomm_pppd_server b/etc/rc.d/rfcomm_pppd_server index f666684..72d2b87 100755 --- a/etc/rc.d/rfcomm_pppd_server +++ b/etc/rc.d/rfcomm_pppd_server @@ -11,7 +11,7 @@ . /etc/rc.subr name="rfcomm_pppd_server" -rcvar=`set_rcvar` +rcvar="rfcomm_pppd_server_enable" command="/usr/sbin/rfcomm_pppd" start_cmd="rfcomm_pppd_server_start" stop_cmd="rfcomm_pppd_server_stop" diff --git a/etc/rc.d/route6d b/etc/rc.d/route6d index a94c3e4..eec74cf 100755 --- a/etc/rc.d/route6d +++ b/etc/rc.d/route6d @@ -10,7 +10,7 @@ . /etc/rc.subr name="route6d" -rcvar=`set_rcvar` +rcvar="route6d_enable" set_rcvar_obsolete ipv6_router_enable route6d_enable set_rcvar_obsolete ipv6_router route6d_program diff --git a/etc/rc.d/routed b/etc/rc.d/routed index c0bd5f7..55bab01 100755 --- a/etc/rc.d/routed +++ b/etc/rc.d/routed @@ -10,8 +10,8 @@ . /etc/rc.subr name="routed" +rcvar="routed_enable" desc="network RIP and router discovery routing daemon" -rcvar=`set_rcvar` set_rcvar_obsolete router_enable routed_enable set_rcvar_obsolete router routed_program diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind index 94f4580..37a428a 100755 --- a/etc/rc.d/rpcbind +++ b/etc/rc.d/rpcbind @@ -10,7 +10,7 @@ . /etc/rc.subr name="rpcbind" -rcvar=`set_rcvar` +rcvar="rpcbind_enable" command="/usr/sbin/${name}" stop_postcmd='/bin/rm -f /var/run/rpcbind.*' diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd index 2ead892..48a3a64 100755 --- a/etc/rc.d/rtadvd +++ b/etc/rc.d/rtadvd @@ -12,7 +12,7 @@ . /etc/network.subr name="rtadvd" -rcvar=`set_rcvar` +rcvar="rtadvd_enable" command="/usr/sbin/${name}" start_precmd="rtadvd_precmd" diff --git a/etc/rc.d/rtsold b/etc/rc.d/rtsold index 64a83e3..9ce19f3 100755 --- a/etc/rc.d/rtsold +++ b/etc/rc.d/rtsold @@ -11,7 +11,7 @@ . /etc/rc.subr name="rtsold" -rcvar=`set_rcvar` +rcvar="rtsold_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" start_postcmd="rtsold_poststart" diff --git a/etc/rc.d/rwho b/etc/rc.d/rwho index e088d99..f4137f7 100755 --- a/etc/rc.d/rwho +++ b/etc/rc.d/rwho @@ -11,7 +11,7 @@ . /etc/rc.subr name="rwhod" -rcvar="`set_rcvar`" +rcvar="rwhod_enable" command="/usr/sbin/${name}" load_rc_config $name diff --git a/etc/rc.d/sdpd b/etc/rc.d/sdpd index acaf380..9f09a30 100755 --- a/etc/rc.d/sdpd +++ b/etc/rc.d/sdpd @@ -12,7 +12,7 @@ name="sdpd" command="/usr/sbin/${name}" -rcvar=`set_rcvar` +rcvar="sdpd_enable" required_modules="ng_btsocket" load_rc_config $name diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail index dfaa8e0..680020f 100755 --- a/etc/rc.d/sendmail +++ b/etc/rc.d/sendmail @@ -15,7 +15,7 @@ . /etc/rc.subr name="sendmail" -rcvar=`set_rcvar` +rcvar="sendmail_enable" required_files="/etc/mail/${name}.cf" start_precmd="sendmail_precmd" @@ -79,14 +79,14 @@ required_files= if checkyesno sendmail_submit_enable; then name="sendmail_submit" - rcvar=`set_rcvar` + rcvar="sendmail_submit_enable" start_cmd="${command} ${sendmail_submit_flags}" run_rc_command "$1" fi if checkyesno sendmail_outbound_enable; then name="sendmail_outbound" - rcvar=`set_rcvar` + rcvar="sendmail_outbound_enable" start_cmd="${command} ${sendmail_outbound_flags}" run_rc_command "$1" fi diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd index 9f00199..a99083c 100755 --- a/etc/rc.d/sshd +++ b/etc/rc.d/sshd @@ -10,7 +10,7 @@ . /etc/rc.subr name="sshd" -rcvar=`set_rcvar` +rcvar="sshd_enable" command="/usr/sbin/${name}" keygen_cmd="sshd_keygen" start_precmd="sshd_precmd" diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd index 5dcd3e9..118995e 100755 --- a/etc/rc.d/syslogd +++ b/etc/rc.d/syslogd @@ -10,7 +10,7 @@ . /etc/rc.subr name="syslogd" -rcvar=`set_rcvar` +rcvar="syslogd_enable" pidfile="/var/run/syslog.pid" command="/usr/sbin/${name}" required_files="/etc/syslog.conf" @@ -41,7 +41,7 @@ syslogd_precmd() # for _l in $altlog_proglist; do eval _ldir=\$${_l}_chrootdir - if checkyesno `set_rcvar $_l` && [ -n "$_ldir" ]; then + if checkyesno ${_l}_enable && [ -n "$_ldir" ]; then echo "${_ldir}/var/run/log" >> $sockfile fi done diff --git a/etc/rc.d/timed b/etc/rc.d/timed index d1cf1a2..b8d7084 100755 --- a/etc/rc.d/timed +++ b/etc/rc.d/timed @@ -11,7 +11,7 @@ . /etc/rc.subr name="timed" -rcvar=`set_rcvar` +rcvar="timed_enable" command="/usr/sbin/${name}" load_rc_config $name diff --git a/etc/rc.d/ubthidhci b/etc/rc.d/ubthidhci index 529f8d6..03751d3 100755 --- a/etc/rc.d/ubthidhci +++ b/etc/rc.d/ubthidhci @@ -11,8 +11,8 @@ . /etc/rc.subr name="ubthidhci" +rcvar="ubthidhci_enable" command="/usr/sbin/usbconfig" -rcvar=`set_rcvar` start_precmd="ubthidhci_prestart" ubthidhci_prestart() diff --git a/etc/rc.d/virecover b/etc/rc.d/virecover index 77cd9a0..f3bcc85 100755 --- a/etc/rc.d/virecover +++ b/etc/rc.d/virecover @@ -12,7 +12,7 @@ . /etc/rc.subr name="virecover" -rcvar="`set_rcvar`" +rcvar="virecover_enable" stop_cmd=":" start_cmd="virecover_start" diff --git a/etc/rc.d/watchdogd b/etc/rc.d/watchdogd index e852126..043e5bc 100755 --- a/etc/rc.d/watchdogd +++ b/etc/rc.d/watchdogd @@ -34,7 +34,7 @@ . /etc/rc.subr name="watchdogd" -rcvar="`set_rcvar`" +rcvar="watchdogd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" |
