Date: Sat, 14 Jan 2012 02:18:42 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r230099 - head/etc/rc.d Message-ID: <201201140218.q0E2Igad090552@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sat Jan 14 02:18:41 2012 New Revision: 230099 URL: http://svn.freebsd.org/changeset/base/230099 Log: Prepare for the removal of set_rcvar() by changing the rcvar= assignments to the literal values it would have returned. The concept of set_rcvar() was nice in theory, but the forks it creates are a drag on the startup process, which is especially noticeable on slower systems, such as embedded ones. During the discussion on freebsd-rc@ a preference was expressed for using ${name}_enable instead of the literal values. However the code portability concept doesn't really apply since there are so many other places where the literal name has to be searched for and replaced. Also, using the literal value is also a tiny bit faster than dereferencing the variables, and every little bit helps. Modified: head/etc/rc.d/accounting head/etc/rc.d/amd head/etc/rc.d/apm head/etc/rc.d/apmd head/etc/rc.d/bootparams head/etc/rc.d/bsnmpd head/etc/rc.d/bthidd head/etc/rc.d/cleanvar head/etc/rc.d/cleartmp head/etc/rc.d/cron head/etc/rc.d/ddb head/etc/rc.d/devd head/etc/rc.d/dmesg head/etc/rc.d/ftp-proxy head/etc/rc.d/ftpd head/etc/rc.d/gptboot head/etc/rc.d/hastd head/etc/rc.d/hcsecd head/etc/rc.d/hostapd head/etc/rc.d/inetd head/etc/rc.d/ip6addrctl head/etc/rc.d/ipfilter head/etc/rc.d/ipfs head/etc/rc.d/ipmon head/etc/rc.d/ipnat head/etc/rc.d/ipsec head/etc/rc.d/ipxrouted head/etc/rc.d/jail head/etc/rc.d/keyserv head/etc/rc.d/lpd head/etc/rc.d/mountd head/etc/rc.d/moused head/etc/rc.d/mroute6d head/etc/rc.d/mrouted head/etc/rc.d/natd head/etc/rc.d/netwait head/etc/rc.d/newsyslog head/etc/rc.d/nfscbd head/etc/rc.d/nfsd head/etc/rc.d/nfsuserd head/etc/rc.d/nscd head/etc/rc.d/ntpd head/etc/rc.d/ntpdate head/etc/rc.d/pf head/etc/rc.d/pflog head/etc/rc.d/pfsync head/etc/rc.d/powerd head/etc/rc.d/ppp head/etc/rc.d/pppoed head/etc/rc.d/quota head/etc/rc.d/rarpd head/etc/rc.d/rfcomm_pppd_server head/etc/rc.d/route6d head/etc/rc.d/routed head/etc/rc.d/rpcbind head/etc/rc.d/rtadvd head/etc/rc.d/rtsold head/etc/rc.d/rwho head/etc/rc.d/sdpd head/etc/rc.d/sendmail head/etc/rc.d/sshd head/etc/rc.d/syslogd head/etc/rc.d/timed head/etc/rc.d/ubthidhci head/etc/rc.d/virecover head/etc/rc.d/watchdogd Modified: head/etc/rc.d/accounting ============================================================================== --- head/etc/rc.d/accounting Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/accounting Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/amd ============================================================================== --- head/etc/rc.d/amd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/amd Sat Jan 14 02:18:41 2012 (r230099) @@ -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="&" Modified: head/etc/rc.d/apm ============================================================================== --- head/etc/rc.d/apm Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/apm Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/apmd ============================================================================== --- head/etc/rc.d/apmd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/apmd Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="apmd" -rcvar=`set_rcvar` +rcvar="apmd_enable" command="/usr/sbin/${name}" start_precmd="apmd_prestart" Modified: head/etc/rc.d/bootparams ============================================================================== --- head/etc/rc.d/bootparams Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/bootparams Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="bootparamd" -rcvar=`set_rcvar` +rcvar="bootparamd_enable" required_files="/etc/bootparams" command="/usr/sbin/${name}" Modified: head/etc/rc.d/bsnmpd ============================================================================== --- head/etc/rc.d/bsnmpd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/bsnmpd Sat Jan 14 02:18:41 2012 (r230099) @@ -10,7 +10,7 @@ . /etc/rc.subr name="bsnmpd" -rcvar=`set_rcvar` +rcvar="bsnmpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/snmpd.pid" Modified: head/etc/rc.d/bthidd ============================================================================== --- head/etc/rc.d/bthidd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/bthidd Sat Jan 14 02:18:41 2012 (r230099) @@ -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() Modified: head/etc/rc.d/cleanvar ============================================================================== --- head/etc/rc.d/cleanvar Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/cleanvar Sat Jan 14 02:18:41 2012 (r230099) @@ -9,7 +9,7 @@ . /etc/rc.subr name="cleanvar" -rcvar=`set_rcvar` +rcvar="cleanvar_enable" start_precmd="${name}_prestart" start_cmd="${name}_start" Modified: head/etc/rc.d/cleartmp ============================================================================== --- head/etc/rc.d/cleartmp Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/cleartmp Sat Jan 14 02:18:41 2012 (r230099) @@ -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=":" Modified: head/etc/rc.d/cron ============================================================================== --- head/etc/rc.d/cron Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/cron Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="cron" -rcvar="`set_rcvar`" +rcvar="cron_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" Modified: head/etc/rc.d/ddb ============================================================================== --- head/etc/rc.d/ddb Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ddb Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ddb" -rcvar=`set_rcvar` +rcvar="ddb_enable" command="/sbin/${name}" start_precmd="ddb_prestart" stop_cmd=":" Modified: head/etc/rc.d/devd ============================================================================== --- head/etc/rc.d/devd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/devd Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="devd" -rcvar=`set_rcvar` +rcvar="devd_enable" command="/sbin/${name}" start_precmd=${name}_prestart Modified: head/etc/rc.d/dmesg ============================================================================== --- head/etc/rc.d/dmesg Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/dmesg Sat Jan 14 02:18:41 2012 (r230099) @@ -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=":" Modified: head/etc/rc.d/ftp-proxy ============================================================================== --- head/etc/rc.d/ftp-proxy Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ftp-proxy Sat Jan 14 02:18:41 2012 (r230099) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ftpproxy" -rcvar=`set_rcvar` +rcvar="ftpproxy_enable" command="/usr/sbin/ftp-proxy" load_rc_config $name Modified: head/etc/rc.d/ftpd ============================================================================== --- head/etc/rc.d/ftpd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ftpd Sat Jan 14 02:18:41 2012 (r230099) @@ -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 Modified: head/etc/rc.d/gptboot ============================================================================== --- head/etc/rc.d/gptboot Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/gptboot Sat Jan 14 02:18:41 2012 (r230099) @@ -34,7 +34,7 @@ . /etc/rc.subr name="gptboot" -rcvar=`set_rcvar` +rcvar="gptboot_enable" start_cmd="gptboot_report" gptboot_report() Modified: head/etc/rc.d/hastd ============================================================================== --- head/etc/rc.d/hastd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/hastd Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/hcsecd ============================================================================== --- head/etc/rc.d/hcsecd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/hcsecd Sat Jan 14 02:18:41 2012 (r230099) @@ -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 Modified: head/etc/rc.d/hostapd ============================================================================== --- head/etc/rc.d/hostapd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/hostapd Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/inetd ============================================================================== --- head/etc/rc.d/inetd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/inetd Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/ip6addrctl ============================================================================== --- head/etc/rc.d/ip6addrctl Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ip6addrctl Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/ipfilter ============================================================================== --- head/etc/rc.d/ipfilter Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ipfilter Sat Jan 14 02:18:41 2012 (r230099) @@ -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}" Modified: head/etc/rc.d/ipfs ============================================================================== --- head/etc/rc.d/ipfs Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ipfs Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/ipmon ============================================================================== --- head/etc/rc.d/ipmon Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ipmon Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipmon" -rcvar=`set_rcvar` +rcvar="ipmon_enable" command="/sbin/${name}" start_precmd="ipmon_precmd" Modified: head/etc/rc.d/ipnat ============================================================================== --- head/etc/rc.d/ipnat Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ipnat Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/ipsec ============================================================================== --- head/etc/rc.d/ipsec Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ipsec Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/ipxrouted ============================================================================== --- head/etc/rc.d/ipxrouted Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ipxrouted Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/jail ============================================================================== --- head/etc/rc.d/jail Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/jail Sat Jan 14 02:18:41 2012 (r230099) @@ -17,7 +17,7 @@ . /etc/rc.subr name="jail" -rcvar=`set_rcvar` +rcvar="jail_enable" start_precmd="jail_prestart" start_cmd="jail_start" Modified: head/etc/rc.d/keyserv ============================================================================== --- head/etc/rc.d/keyserv Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/keyserv Sat Jan 14 02:18:41 2012 (r230099) @@ -13,7 +13,7 @@ . /etc/rc.subr name="keyserv" -rcvar=`set_rcvar` +rcvar="keyserv_enable" command="/usr/sbin/${name}" start_precmd="keyserv_prestart" Modified: head/etc/rc.d/lpd ============================================================================== --- head/etc/rc.d/lpd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/lpd Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/mountd ============================================================================== --- head/etc/rc.d/mountd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/mountd Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/moused ============================================================================== --- head/etc/rc.d/moused Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/moused Sat Jan 14 02:18:41 2012 (r230099) @@ -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 Modified: head/etc/rc.d/mroute6d ============================================================================== --- head/etc/rc.d/mroute6d Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/mroute6d Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="mroute6d" -rcvar=`set_rcvar` +rcvar="mroute6d_enable" command="/usr/local/sbin/pim6dd" load_rc_config $name Modified: head/etc/rc.d/mrouted ============================================================================== --- head/etc/rc.d/mrouted Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/mrouted Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/natd ============================================================================== --- head/etc/rc.d/natd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/natd Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/netwait ============================================================================== --- head/etc/rc.d/netwait Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/netwait Sat Jan 14 02:18:41 2012 (r230099) @@ -14,7 +14,7 @@ . /etc/rc.subr name="netwait" -rcvar=`set_rcvar` +rcvar="netwait_enable" start_cmd="${name}_start" stop_cmd=":" Modified: head/etc/rc.d/newsyslog ============================================================================== --- head/etc/rc.d/newsyslog Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/newsyslog Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/nfscbd ============================================================================== --- head/etc/rc.d/nfscbd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/nfscbd Sat Jan 14 02:18:41 2012 (r230099) @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfscbd" -rcvar=`set_rcvar` +rcvar="nfscbd_enable" command="/usr/sbin/${name}" sig_stop="USR1" Modified: head/etc/rc.d/nfsd ============================================================================== --- head/etc/rc.d/nfsd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/nfsd Sat Jan 14 02:18:41 2012 (r230099) @@ -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 Modified: head/etc/rc.d/nfsuserd ============================================================================== --- head/etc/rc.d/nfsuserd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/nfsuserd Sat Jan 14 02:18:41 2012 (r230099) @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfsuserd" -rcvar=`set_rcvar` +rcvar="nfsuserd_enable" command="/usr/sbin/${name}" sig_stop="USR1" Modified: head/etc/rc.d/nscd ============================================================================== --- head/etc/rc.d/nscd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/nscd Sat Jan 14 02:18:41 2012 (r230099) @@ -19,7 +19,7 @@ . /etc/rc.subr name="nscd" -rcvar=`set_rcvar` +rcvar="nscd_enable" command=/usr/sbin/nscd extra_commands="flush" Modified: head/etc/rc.d/ntpd ============================================================================== --- head/etc/rc.d/ntpd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ntpd Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/ntpdate ============================================================================== --- head/etc/rc.d/ntpdate Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ntpdate Sat Jan 14 02:18:41 2012 (r230099) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ntpdate" -rcvar=`set_rcvar` +rcvar="ntpdate_enable" stop_cmd=":" start_cmd="ntpdate_start" Modified: head/etc/rc.d/pf ============================================================================== --- head/etc/rc.d/pf Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/pf Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/pflog ============================================================================== --- head/etc/rc.d/pflog Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/pflog Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/pfsync ============================================================================== --- head/etc/rc.d/pfsync Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/pfsync Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/powerd ============================================================================== --- head/etc/rc.d/powerd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/powerd Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="powerd" -rcvar=`set_rcvar` +rcvar="powerd_enable" command="/usr/sbin/${name}" stop_postcmd=powerd_poststop Modified: head/etc/rc.d/ppp ============================================================================== --- head/etc/rc.d/ppp Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ppp Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/pppoed ============================================================================== --- head/etc/rc.d/pppoed Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/pppoed Sat Jan 14 02:18:41 2012 (r230099) @@ -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=":" Modified: head/etc/rc.d/quota ============================================================================== --- head/etc/rc.d/quota Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/quota Sat Jan 14 02:18:41 2012 (r230099) @@ -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}" Modified: head/etc/rc.d/rarpd ============================================================================== --- head/etc/rc.d/rarpd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/rarpd Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/rfcomm_pppd_server ============================================================================== --- head/etc/rc.d/rfcomm_pppd_server Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/rfcomm_pppd_server Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/route6d ============================================================================== --- head/etc/rc.d/route6d Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/route6d Sat Jan 14 02:18:41 2012 (r230099) @@ -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 Modified: head/etc/rc.d/routed ============================================================================== --- head/etc/rc.d/routed Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/routed Sat Jan 14 02:18:41 2012 (r230099) @@ -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 Modified: head/etc/rc.d/rpcbind ============================================================================== --- head/etc/rc.d/rpcbind Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/rpcbind Sat Jan 14 02:18:41 2012 (r230099) @@ -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.*' Modified: head/etc/rc.d/rtadvd ============================================================================== --- head/etc/rc.d/rtadvd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/rtadvd Sat Jan 14 02:18:41 2012 (r230099) @@ -12,7 +12,7 @@ . /etc/network.subr name="rtadvd" -rcvar=`set_rcvar` +rcvar="rtadvd_enable" command="/usr/sbin/${name}" start_precmd="rtadvd_precmd" Modified: head/etc/rc.d/rtsold ============================================================================== --- head/etc/rc.d/rtsold Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/rtsold Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/rwho ============================================================================== --- head/etc/rc.d/rwho Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/rwho Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rwhod" -rcvar="`set_rcvar`" +rcvar="rwhod_enable" command="/usr/sbin/${name}" load_rc_config $name Modified: head/etc/rc.d/sdpd ============================================================================== --- head/etc/rc.d/sdpd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/sdpd Sat Jan 14 02:18:41 2012 (r230099) @@ -12,7 +12,7 @@ name="sdpd" command="/usr/sbin/${name}" -rcvar=`set_rcvar` +rcvar="sdpd_enable" required_modules="ng_btsocket" load_rc_config $name Modified: head/etc/rc.d/sendmail ============================================================================== --- head/etc/rc.d/sendmail Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/sendmail Sat Jan 14 02:18:41 2012 (r230099) @@ -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 Modified: head/etc/rc.d/sshd ============================================================================== --- head/etc/rc.d/sshd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/sshd Sat Jan 14 02:18:41 2012 (r230099) @@ -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" Modified: head/etc/rc.d/syslogd ============================================================================== --- head/etc/rc.d/syslogd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/syslogd Sat Jan 14 02:18:41 2012 (r230099) @@ -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 Modified: head/etc/rc.d/timed ============================================================================== --- head/etc/rc.d/timed Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/timed Sat Jan 14 02:18:41 2012 (r230099) @@ -11,7 +11,7 @@ . /etc/rc.subr name="timed" -rcvar=`set_rcvar` +rcvar="timed_enable" command="/usr/sbin/${name}" load_rc_config $name Modified: head/etc/rc.d/ubthidhci ============================================================================== --- head/etc/rc.d/ubthidhci Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/ubthidhci Sat Jan 14 02:18:41 2012 (r230099) @@ -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() Modified: head/etc/rc.d/virecover ============================================================================== --- head/etc/rc.d/virecover Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/virecover Sat Jan 14 02:18:41 2012 (r230099) @@ -12,7 +12,7 @@ . /etc/rc.subr name="virecover" -rcvar="`set_rcvar`" +rcvar="virecover_enable" stop_cmd=":" start_cmd="virecover_start" Modified: head/etc/rc.d/watchdogd ============================================================================== --- head/etc/rc.d/watchdogd Sat Jan 14 00:53:26 2012 (r230098) +++ head/etc/rc.d/watchdogd Sat Jan 14 02:18:41 2012 (r230099) @@ -34,7 +34,7 @@ . /etc/rc.subr name="watchdogd" -rcvar="`set_rcvar`" +rcvar="watchdogd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201140218.q0E2Igad090552>