Date: Tue, 14 Feb 2012 10:16:57 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r231653 - stable/9/etc/rc.d Message-ID: <201202141016.q1EAGvoj092311@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Tue Feb 14 10:16:56 2012 New Revision: 231653 URL: http://svn.freebsd.org/changeset/base/231653 Log: MFC r230099: Change rcvar= assignments to the literal values set_rcvar would have returned. This will slightly reduce boot time, and help in diff reduction to HEAD. Modified: stable/9/etc/rc.d/accounting stable/9/etc/rc.d/amd stable/9/etc/rc.d/apm stable/9/etc/rc.d/apmd stable/9/etc/rc.d/bootparams stable/9/etc/rc.d/bsnmpd stable/9/etc/rc.d/bthidd stable/9/etc/rc.d/cleanvar stable/9/etc/rc.d/cleartmp stable/9/etc/rc.d/cron stable/9/etc/rc.d/ddb stable/9/etc/rc.d/devd stable/9/etc/rc.d/dmesg stable/9/etc/rc.d/ftp-proxy stable/9/etc/rc.d/ftpd stable/9/etc/rc.d/gptboot stable/9/etc/rc.d/hastd stable/9/etc/rc.d/hcsecd stable/9/etc/rc.d/hostapd stable/9/etc/rc.d/inetd stable/9/etc/rc.d/ip6addrctl stable/9/etc/rc.d/ipfilter stable/9/etc/rc.d/ipfs stable/9/etc/rc.d/ipmon stable/9/etc/rc.d/ipnat stable/9/etc/rc.d/ipsec stable/9/etc/rc.d/ipxrouted stable/9/etc/rc.d/jail stable/9/etc/rc.d/keyserv stable/9/etc/rc.d/lpd stable/9/etc/rc.d/mountd stable/9/etc/rc.d/moused stable/9/etc/rc.d/mroute6d stable/9/etc/rc.d/mrouted stable/9/etc/rc.d/natd stable/9/etc/rc.d/netwait stable/9/etc/rc.d/newsyslog stable/9/etc/rc.d/nfscbd stable/9/etc/rc.d/nfsd stable/9/etc/rc.d/nfsuserd stable/9/etc/rc.d/nscd stable/9/etc/rc.d/ntpd stable/9/etc/rc.d/ntpdate stable/9/etc/rc.d/pf stable/9/etc/rc.d/pflog stable/9/etc/rc.d/pfsync stable/9/etc/rc.d/powerd stable/9/etc/rc.d/ppp stable/9/etc/rc.d/pppoed stable/9/etc/rc.d/quota stable/9/etc/rc.d/rarpd stable/9/etc/rc.d/rfcomm_pppd_server stable/9/etc/rc.d/route6d stable/9/etc/rc.d/routed stable/9/etc/rc.d/rpcbind stable/9/etc/rc.d/rtadvd stable/9/etc/rc.d/rtsold stable/9/etc/rc.d/rwho stable/9/etc/rc.d/sdpd stable/9/etc/rc.d/sendmail stable/9/etc/rc.d/sshd stable/9/etc/rc.d/syslogd stable/9/etc/rc.d/timed stable/9/etc/rc.d/ubthidhci stable/9/etc/rc.d/virecover stable/9/etc/rc.d/watchdogd Directory Properties: stable/9/etc/ (props changed) Modified: stable/9/etc/rc.d/accounting ============================================================================== --- stable/9/etc/rc.d/accounting Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/accounting Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/amd ============================================================================== --- stable/9/etc/rc.d/amd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/amd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/apm ============================================================================== --- stable/9/etc/rc.d/apm Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/apm Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/apmd ============================================================================== --- stable/9/etc/rc.d/apmd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/apmd Tue Feb 14 10:16:56 2012 (r231653) @@ -11,7 +11,7 @@ . /etc/rc.subr name="apmd" -rcvar=`set_rcvar` +rcvar="apmd_enable" command="/usr/sbin/${name}" start_precmd="apmd_prestart" Modified: stable/9/etc/rc.d/bootparams ============================================================================== --- stable/9/etc/rc.d/bootparams Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/bootparams Tue Feb 14 10:16:56 2012 (r231653) @@ -11,7 +11,7 @@ . /etc/rc.subr name="bootparamd" -rcvar=`set_rcvar` +rcvar="bootparamd_enable" required_files="/etc/bootparams" command="/usr/sbin/${name}" Modified: stable/9/etc/rc.d/bsnmpd ============================================================================== --- stable/9/etc/rc.d/bsnmpd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/bsnmpd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/bthidd ============================================================================== --- stable/9/etc/rc.d/bthidd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/bthidd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/cleanvar ============================================================================== --- stable/9/etc/rc.d/cleanvar Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/cleanvar Tue Feb 14 10:16:56 2012 (r231653) @@ -9,7 +9,7 @@ . /etc/rc.subr name="cleanvar" -rcvar=`set_rcvar` +rcvar="cleanvar_enable" start_precmd="${name}_prestart" start_cmd="${name}_start" Modified: stable/9/etc/rc.d/cleartmp ============================================================================== --- stable/9/etc/rc.d/cleartmp Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/cleartmp Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/cron ============================================================================== --- stable/9/etc/rc.d/cron Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/cron Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ddb ============================================================================== --- stable/9/etc/rc.d/ddb Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ddb Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/devd ============================================================================== --- stable/9/etc/rc.d/devd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/devd Tue Feb 14 10:16:56 2012 (r231653) @@ -11,7 +11,7 @@ . /etc/rc.subr name="devd" -rcvar=`set_rcvar` +rcvar="devd_enable" command="/sbin/${name}" start_precmd=${name}_prestart Modified: stable/9/etc/rc.d/dmesg ============================================================================== --- stable/9/etc/rc.d/dmesg Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/dmesg Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ftp-proxy ============================================================================== --- stable/9/etc/rc.d/ftp-proxy Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ftp-proxy Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ftpd ============================================================================== --- stable/9/etc/rc.d/ftpd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ftpd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/gptboot ============================================================================== --- stable/9/etc/rc.d/gptboot Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/gptboot Tue Feb 14 10:16:56 2012 (r231653) @@ -34,7 +34,7 @@ . /etc/rc.subr name="gptboot" -rcvar=`set_rcvar` +rcvar="gptboot_enable" start_cmd="gptboot_report" gptboot_report() Modified: stable/9/etc/rc.d/hastd ============================================================================== --- stable/9/etc/rc.d/hastd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/hastd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/hcsecd ============================================================================== --- stable/9/etc/rc.d/hcsecd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/hcsecd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/hostapd ============================================================================== --- stable/9/etc/rc.d/hostapd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/hostapd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/inetd ============================================================================== --- stable/9/etc/rc.d/inetd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/inetd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ip6addrctl ============================================================================== --- stable/9/etc/rc.d/ip6addrctl Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ip6addrctl Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ipfilter ============================================================================== --- stable/9/etc/rc.d/ipfilter Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ipfilter Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ipfs ============================================================================== --- stable/9/etc/rc.d/ipfs Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ipfs Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ipmon ============================================================================== --- stable/9/etc/rc.d/ipmon Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ipmon Tue Feb 14 10:16:56 2012 (r231653) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipmon" -rcvar=`set_rcvar` +rcvar="ipmon_enable" command="/sbin/${name}" start_precmd="ipmon_precmd" Modified: stable/9/etc/rc.d/ipnat ============================================================================== --- stable/9/etc/rc.d/ipnat Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ipnat Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ipsec ============================================================================== --- stable/9/etc/rc.d/ipsec Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ipsec Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ipxrouted ============================================================================== --- stable/9/etc/rc.d/ipxrouted Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ipxrouted Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/jail ============================================================================== --- stable/9/etc/rc.d/jail Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/jail Tue Feb 14 10:16:56 2012 (r231653) @@ -17,7 +17,7 @@ . /etc/rc.subr name="jail" -rcvar=`set_rcvar` +rcvar="jail_enable" start_precmd="jail_prestart" start_cmd="jail_start" Modified: stable/9/etc/rc.d/keyserv ============================================================================== --- stable/9/etc/rc.d/keyserv Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/keyserv Tue Feb 14 10:16:56 2012 (r231653) @@ -13,7 +13,7 @@ . /etc/rc.subr name="keyserv" -rcvar=`set_rcvar` +rcvar="keyserv_enable" command="/usr/sbin/${name}" start_precmd="keyserv_prestart" Modified: stable/9/etc/rc.d/lpd ============================================================================== --- stable/9/etc/rc.d/lpd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/lpd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/mountd ============================================================================== --- stable/9/etc/rc.d/mountd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/mountd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/moused ============================================================================== --- stable/9/etc/rc.d/moused Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/moused Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/mroute6d ============================================================================== --- stable/9/etc/rc.d/mroute6d Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/mroute6d Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/mrouted ============================================================================== --- stable/9/etc/rc.d/mrouted Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/mrouted Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/natd ============================================================================== --- stable/9/etc/rc.d/natd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/natd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/netwait ============================================================================== --- stable/9/etc/rc.d/netwait Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/netwait Tue Feb 14 10:16:56 2012 (r231653) @@ -14,7 +14,7 @@ . /etc/rc.subr name="netwait" -rcvar=`set_rcvar` +rcvar="netwait_enable" start_cmd="${name}_start" stop_cmd=":" Modified: stable/9/etc/rc.d/newsyslog ============================================================================== --- stable/9/etc/rc.d/newsyslog Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/newsyslog Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/nfscbd ============================================================================== --- stable/9/etc/rc.d/nfscbd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/nfscbd Tue Feb 14 10:16:56 2012 (r231653) @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfscbd" -rcvar=`set_rcvar` +rcvar="nfscbd_enable" command="/usr/sbin/${name}" sig_stop="USR1" Modified: stable/9/etc/rc.d/nfsd ============================================================================== --- stable/9/etc/rc.d/nfsd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/nfsd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/nfsuserd ============================================================================== --- stable/9/etc/rc.d/nfsuserd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/nfsuserd Tue Feb 14 10:16:56 2012 (r231653) @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfsuserd" -rcvar=`set_rcvar` +rcvar="nfsuserd_enable" command="/usr/sbin/${name}" sig_stop="USR1" Modified: stable/9/etc/rc.d/nscd ============================================================================== --- stable/9/etc/rc.d/nscd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/nscd Tue Feb 14 10:16:56 2012 (r231653) @@ -19,7 +19,7 @@ . /etc/rc.subr name="nscd" -rcvar=`set_rcvar` +rcvar="nscd_enable" command=/usr/sbin/nscd extra_commands="flush" Modified: stable/9/etc/rc.d/ntpd ============================================================================== --- stable/9/etc/rc.d/ntpd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ntpd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/ntpdate ============================================================================== --- stable/9/etc/rc.d/ntpdate Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ntpdate Tue Feb 14 10:16:56 2012 (r231653) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ntpdate" -rcvar=`set_rcvar` +rcvar="ntpdate_enable" stop_cmd=":" start_cmd="ntpdate_start" Modified: stable/9/etc/rc.d/pf ============================================================================== --- stable/9/etc/rc.d/pf Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/pf Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/pflog ============================================================================== --- stable/9/etc/rc.d/pflog Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/pflog Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/pfsync ============================================================================== --- stable/9/etc/rc.d/pfsync Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/pfsync Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/powerd ============================================================================== --- stable/9/etc/rc.d/powerd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/powerd Tue Feb 14 10:16:56 2012 (r231653) @@ -11,7 +11,7 @@ . /etc/rc.subr name="powerd" -rcvar=`set_rcvar` +rcvar="powerd_enable" command="/usr/sbin/${name}" stop_postcmd=powerd_poststop Modified: stable/9/etc/rc.d/ppp ============================================================================== --- stable/9/etc/rc.d/ppp Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ppp Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/pppoed ============================================================================== --- stable/9/etc/rc.d/pppoed Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/pppoed Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/quota ============================================================================== --- stable/9/etc/rc.d/quota Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/quota Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/rarpd ============================================================================== --- stable/9/etc/rc.d/rarpd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/rarpd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/rfcomm_pppd_server ============================================================================== --- stable/9/etc/rc.d/rfcomm_pppd_server Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/rfcomm_pppd_server Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/route6d ============================================================================== --- stable/9/etc/rc.d/route6d Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/route6d Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/routed ============================================================================== --- stable/9/etc/rc.d/routed Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/routed Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/rpcbind ============================================================================== --- stable/9/etc/rc.d/rpcbind Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/rpcbind Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/rtadvd ============================================================================== --- stable/9/etc/rc.d/rtadvd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/rtadvd Tue Feb 14 10:16:56 2012 (r231653) @@ -12,7 +12,7 @@ . /etc/network.subr name="rtadvd" -rcvar=`set_rcvar` +rcvar="rtadvd_enable" command="/usr/sbin/${name}" start_precmd="rtadvd_precmd" Modified: stable/9/etc/rc.d/rtsold ============================================================================== --- stable/9/etc/rc.d/rtsold Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/rtsold Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/rwho ============================================================================== --- stable/9/etc/rc.d/rwho Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/rwho Tue Feb 14 10:16:56 2012 (r231653) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rwhod" -rcvar="`set_rcvar`" +rcvar="rwhod_enable" command="/usr/sbin/${name}" load_rc_config $name Modified: stable/9/etc/rc.d/sdpd ============================================================================== --- stable/9/etc/rc.d/sdpd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/sdpd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/sendmail ============================================================================== --- stable/9/etc/rc.d/sendmail Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/sendmail Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/sshd ============================================================================== --- stable/9/etc/rc.d/sshd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/sshd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/syslogd ============================================================================== --- stable/9/etc/rc.d/syslogd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/syslogd Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/timed ============================================================================== --- stable/9/etc/rc.d/timed Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/timed Tue Feb 14 10:16:56 2012 (r231653) @@ -11,7 +11,7 @@ . /etc/rc.subr name="timed" -rcvar=`set_rcvar` +rcvar="timed_enable" command="/usr/sbin/${name}" load_rc_config $name Modified: stable/9/etc/rc.d/ubthidhci ============================================================================== --- stable/9/etc/rc.d/ubthidhci Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/ubthidhci Tue Feb 14 10:16:56 2012 (r231653) @@ -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: stable/9/etc/rc.d/virecover ============================================================================== --- stable/9/etc/rc.d/virecover Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/virecover Tue Feb 14 10:16:56 2012 (r231653) @@ -12,7 +12,7 @@ . /etc/rc.subr name="virecover" -rcvar="`set_rcvar`" +rcvar="virecover_enable" stop_cmd=":" start_cmd="virecover_start" Modified: stable/9/etc/rc.d/watchdogd ============================================================================== --- stable/9/etc/rc.d/watchdogd Tue Feb 14 10:11:53 2012 (r231652) +++ stable/9/etc/rc.d/watchdogd Tue Feb 14 10:16:56 2012 (r231653) @@ -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?201202141016.q1EAGvoj092311>