diff options
author | Doug Barton <dougb@FreeBSD.org> | 2012-01-14 08:57:23 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2012-01-14 08:57:23 +0000 |
commit | 83eb2c37009874672764765ec3bf3b59286c7391 (patch) | |
tree | a956ace1a4a1e10876d4c36f12af02bc9df6cb29 /dns | |
parent | - fix build with gcc46 (diff) |
In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().
In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.
Notes
Notes:
svn path=/head/; revision=289156
Diffstat (limited to 'dns')
28 files changed, 28 insertions, 28 deletions
diff --git a/dns/adsuck/files/adsuck.in b/dns/adsuck/files/adsuck.in index 966af0637698..d9c694e94bfb 100644 --- a/dns/adsuck/files/adsuck.in +++ b/dns/adsuck/files/adsuck.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="adsuck" -rcvar=${name}_enable +rcvar=adsuck_enable command=%%PREFIX%%/sbin/${name} extra_commands="reload" diff --git a/dns/bindgraph/files/bindgraph.in b/dns/bindgraph/files/bindgraph.in index 2856d87006b2..62b0fd34d204 100644 --- a/dns/bindgraph/files/bindgraph.in +++ b/dns/bindgraph/files/bindgraph.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="bindgraph" -rcvar=`set_rcvar` +rcvar=bindgraph_enable command=%%PREFIX%%/sbin/${name}.pl > /dev/null 2>&1 command_interpreter=/usr/bin/perl diff --git a/dns/ddclient/files/ddclient.in b/dns/ddclient/files/ddclient.in index ea066ddf1bb0..7e32aa4e3408 100644 --- a/dns/ddclient/files/ddclient.in +++ b/dns/ddclient/files/ddclient.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="ddclient" -rcvar=${name}_enable +rcvar=ddclient_enable command="%%PREFIX%%/sbin/${name}" required_files="%%PREFIX%%/etc/${name}.conf" diff --git a/dns/dnrd/files/dnrd.sh.in b/dns/dnrd/files/dnrd.sh.in index 0ec87c0d7df2..1e801c5d493d 100644 --- a/dns/dnrd/files/dnrd.sh.in +++ b/dns/dnrd/files/dnrd.sh.in @@ -15,7 +15,7 @@ dnrd_enable=${dnrd_enable-"NO"} . /etc/rc.subr name=dnrd -rcvar=$(set_rcvar) +rcvar=dnrd_enable command=%%PREFIX%%/sbin/${name} pidfile=/var/run/${name}.pid diff --git a/dns/dns_balance/files/dns_balance.sh.in b/dns/dns_balance/files/dns_balance.sh.in index cbeac7ab8d2d..50a51098631c 100644 --- a/dns/dns_balance/files/dns_balance.sh.in +++ b/dns/dns_balance/files/dns_balance.sh.in @@ -12,7 +12,7 @@ . /etc/rc.subr name=dns_balance -rcvar=`set_rcvar` +rcvar=dns_balance_enable load_rc_config ${name} : ${dns_balance_enable="NO"} diff --git a/dns/dnscheckengine/files/patch-contrib_dnscheck-dispatcher.sh b/dns/dnscheckengine/files/patch-contrib_dnscheck-dispatcher.sh index 5aa9989f5e45..bc9b80e8438f 100644 --- a/dns/dnscheckengine/files/patch-contrib_dnscheck-dispatcher.sh +++ b/dns/dnscheckengine/files/patch-contrib_dnscheck-dispatcher.sh @@ -6,7 +6,7 @@ $FreeBSD$ @@ -20,7 +20,7 @@ name="dnscheck_dispatcher" - rcvar=`set_rcvar` + rcvar=dnscheck_dispatcher_enable -command="/usr/local/bin/dnscheck-dispatcher" +command="%%PREFIX%%/libexec/dnscheck/dnscheck-dispatcher" diff --git a/dns/dnsmasq/files/dnsmasq.sh.in b/dns/dnsmasq/files/dnsmasq.sh.in index a56289ab2d22..26d7b267d301 100644 --- a/dns/dnsmasq/files/dnsmasq.sh.in +++ b/dns/dnsmasq/files/dnsmasq.sh.in @@ -43,7 +43,7 @@ . /etc/rc.subr name=dnsmasq -rcvar=$(set_rcvar) +rcvar=dnsmasq_enable command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" diff --git a/dns/dnsproxy/files/dnsproxy.in b/dns/dnsproxy/files/dnsproxy.in index e35fd5660d43..9e60ce4d9a79 100644 --- a/dns/dnsproxy/files/dnsproxy.in +++ b/dns/dnsproxy/files/dnsproxy.in @@ -24,7 +24,7 @@ command_args=${dnsproxy_flags:-"-c %%ETCDIR%%/dnsproxy.conf -d"} . /etc/rc.subr name="dnsproxy" -rcvar=`set_rcvar` +rcvar=dnsproxy_enable command="%%PREFIX%%/sbin/dnsproxy" diff --git a/dns/dnsreflector/files/dnsreflector.in b/dns/dnsreflector/files/dnsreflector.in index 6d51b18cdda0..c70af615e15f 100644 --- a/dns/dnsreflector/files/dnsreflector.in +++ b/dns/dnsreflector/files/dnsreflector.in @@ -24,7 +24,7 @@ command_args=${dnsreflector_flags:-"-d -a 127.0.0.1 -p 53000"} . /etc/rc.subr name="dnsreflector" -rcvar=`set_rcvar` +rcvar=dnsreflector_enable command="%%PREFIX%%/sbin/dnsreflector" diff --git a/dns/dualserver/files/dualserver.sh.in b/dns/dualserver/files/dualserver.sh.in index bcd54f6eb1d5..9c90a19714bd 100644 --- a/dns/dualserver/files/dualserver.sh.in +++ b/dns/dualserver/files/dualserver.sh.in @@ -9,7 +9,7 @@ . /etc/rc.subr name="dualserver" -rcvar=`set_rcvar` +rcvar=dualserver_enable start_cmd="dualserver_startcmd" stop_cmd="dualserver_stopcmd" diff --git a/dns/ez-ipupdate/files/ez-ipupdate.sh.in b/dns/ez-ipupdate/files/ez-ipupdate.sh.in index fb9a4a77cc5d..1209b62e4770 100644 --- a/dns/ez-ipupdate/files/ez-ipupdate.sh.in +++ b/dns/ez-ipupdate/files/ez-ipupdate.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=ez_ipupdate -rcvar=`set_rcvar` +rcvar=ez_ipupdate_enable load_rc_config $name diff --git a/dns/inadyn/files/inadyn.in b/dns/inadyn/files/inadyn.in index e7ed8818edc0..8f70254405ea 100644 --- a/dns/inadyn/files/inadyn.in +++ b/dns/inadyn/files/inadyn.in @@ -23,7 +23,7 @@ . /etc/rc.subr name="inadyn" -rcvar=`set_rcvar` +rcvar=inadyn_enable command=%%PREFIX%%/bin/${name} diff --git a/dns/maradns/files/maradns.in b/dns/maradns/files/maradns.in index dafc71d470f3..0d36f307f9b6 100644 --- a/dns/maradns/files/maradns.in +++ b/dns/maradns/files/maradns.in @@ -15,7 +15,7 @@ : ${maradns_conf="%%PREFIX%%/etc/mararc"} name="maradns" -rcvar=`set_rcvar` +rcvar=maradns_enable command="%%PREFIX%%/bin/duende" command_args="%%PREFIX%%/sbin/maradns -f ${maradns_conf}" pidfile="/var/run/${name}.pid" diff --git a/dns/maradns/files/zoneserver.in b/dns/maradns/files/zoneserver.in index 84e59315b98f..40614d213081 100644 --- a/dns/maradns/files/zoneserver.in +++ b/dns/maradns/files/zoneserver.in @@ -15,7 +15,7 @@ : ${maradns_conf="%%PREFIX%%/etc/mararc"} name="zoneserver" -rcvar=`set_rcvar` +rcvar=zoneserver_enable command="%%PREFIX%%/bin/duende" command_args="%%PREFIX%%/sbin/zoneserver -f ${maradns_conf}" pidfile="/var/run/${name}.pid" diff --git a/dns/mydns-ng/files/mydns.in b/dns/mydns-ng/files/mydns.in index 20bd91a7931d..896a550fda4b 100644 --- a/dns/mydns-ng/files/mydns.in +++ b/dns/mydns-ng/files/mydns.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="mydns" -rcvar=`set_rcvar` +rcvar=mydns_enable load_rc_config $name diff --git a/dns/mydns/files/mydns.sh.in b/dns/mydns/files/mydns.sh.in index 20bd91a7931d..896a550fda4b 100644 --- a/dns/mydns/files/mydns.sh.in +++ b/dns/mydns/files/mydns.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="mydns" -rcvar=`set_rcvar` +rcvar=mydns_enable load_rc_config $name diff --git a/dns/noip/files/noip.in b/dns/noip/files/noip.in index b9e7326f0355..67509068fedc 100644 --- a/dns/noip/files/noip.in +++ b/dns/noip/files/noip.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="noip" -rcvar=`set_rcvar` +rcvar=noip_enable command="%%PREFIX%%/bin/noip2" diff --git a/dns/nsd/files/nsd.in b/dns/nsd/files/nsd.in index a040d4d5b59c..5021db398267 100644 --- a/dns/nsd/files/nsd.in +++ b/dns/nsd/files/nsd.in @@ -15,7 +15,7 @@ . /etc/rc.subr name=nsd -rcvar=`set_rcvar` +rcvar=nsd_enable required_files=%%PREFIX%%/etc/nsd/nsd.conf diff --git a/dns/opendd/files/opendd.in b/dns/opendd/files/opendd.in index b8f3ce6dfddd..c1b6d5bdc6a2 100644 --- a/dns/opendd/files/opendd.in +++ b/dns/opendd/files/opendd.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="opendd" -rcvar=${name}_enable +rcvar=opendd_enable load_rc_config $name diff --git a/dns/opendnssec/files/opendnssec.in b/dns/opendnssec/files/opendnssec.in index 9fedbd161f99..7f76f0e00f71 100644 --- a/dns/opendnssec/files/opendnssec.in +++ b/dns/opendnssec/files/opendnssec.in @@ -14,7 +14,7 @@ . /etc/rc.subr name=opendnssec -rcvar=`set_rcvar` +rcvar=opendnssec_enable load_rc_config $name diff --git a/dns/pdnsd/files/pdnsd.in b/dns/pdnsd/files/pdnsd.in index 1d8172b210fe..0d497057301b 100644 --- a/dns/pdnsd/files/pdnsd.in +++ b/dns/pdnsd/files/pdnsd.in @@ -7,7 +7,7 @@ . /etc/rc.subr name="pdnsd" -rcvar=${name}_enable +rcvar=pdnsd_enable command="%%PREFIX%%/sbin/pdnsd" command_args="-d" required_files="%%PREFIX%%/etc/pdnsd.conf" diff --git a/dns/powerdns-devel/files/pdns-devel.in b/dns/powerdns-devel/files/pdns-devel.in index 5d4e241c4e81..27be465f7546 100644 --- a/dns/powerdns-devel/files/pdns-devel.in +++ b/dns/powerdns-devel/files/pdns-devel.in @@ -19,7 +19,7 @@ . /etc/rc.subr name=pdns -rcvar=`set_rcvar` +rcvar=pdns_enable command=%%PREFIX%%/sbin/pdns_server diff --git a/dns/powerdns-recursor/files/pdns-recursor.in b/dns/powerdns-recursor/files/pdns-recursor.in index fa96b8e928ae..8c3310be695a 100644 --- a/dns/powerdns-recursor/files/pdns-recursor.in +++ b/dns/powerdns-recursor/files/pdns-recursor.in @@ -20,7 +20,7 @@ . /etc/rc.subr name=pdns_recursor -rcvar=`set_rcvar` +rcvar=pdns_recursor_enable command=%%PREFIX%%/sbin/pdns_recursor diff --git a/dns/powerdns/files/pdns.in b/dns/powerdns/files/pdns.in index 5d4e241c4e81..27be465f7546 100644 --- a/dns/powerdns/files/pdns.in +++ b/dns/powerdns/files/pdns.in @@ -19,7 +19,7 @@ . /etc/rc.subr name=pdns -rcvar=`set_rcvar` +rcvar=pdns_enable command=%%PREFIX%%/sbin/pdns_server diff --git a/dns/radns/files/radns.in b/dns/radns/files/radns.in index 81d31496c68f..63977fd9cf07 100644 --- a/dns/radns/files/radns.in +++ b/dns/radns/files/radns.in @@ -17,7 +17,7 @@ . /etc/rc.subr name=radns -rcvar=`set_rcvar` +rcvar=radns_enable radns_dir="%%PREFIX%%/etc/radns" load_rc_config $name diff --git a/dns/rbldnsd/files/rbldnsd.in b/dns/rbldnsd/files/rbldnsd.in index 799d4c707190..dcab5decfb7b 100644 --- a/dns/rbldnsd/files/rbldnsd.in +++ b/dns/rbldnsd/files/rbldnsd.in @@ -18,7 +18,7 @@ . /etc/rc.subr name=rbldnsd -rcvar=`set_rcvar` +rcvar=rbldnsd_enable command=%%PREFIX%%/sbin/rbldnsd pidfile=/var/run/rbldnsd.pid diff --git a/dns/totd/files/totd.in b/dns/totd/files/totd.in index d66cdfa44a22..c0c9eb9a8e50 100644 --- a/dns/totd/files/totd.in +++ b/dns/totd/files/totd.in @@ -20,7 +20,7 @@ totd_enable=${totd_enable:-"NO"} # Enable totd . /etc/rc.subr name="totd" -rcvar=`set_rcvar` +rcvar=totd_enable command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="%%PREFIX%%/etc/${name}.conf" diff --git a/dns/unbound/files/unbound.in b/dns/unbound/files/unbound.in index a6125df1778e..94d3807870b3 100644 --- a/dns/unbound/files/unbound.in +++ b/dns/unbound/files/unbound.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="unbound" -rcvar=`set_rcvar` +rcvar=unbound_enable command="%%PREFIX%%/sbin/unbound" extra_commands="reload" |