diff options
Diffstat (limited to 'sysutils')
124 files changed, 167 insertions, 164 deletions
diff --git a/sysutils/3dm/files/3dm2.sh.in b/sysutils/3dm/files/3dm2.sh.in index b6dde38fe688..93f0f65962dd 100644 --- a/sysutils/3dm/files/3dm2.sh.in +++ b/sysutils/3dm/files/3dm2.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=twdm2 -rcvar=`set_rcvar` +rcvar=twdm2_enable start_precmd=twdm2_precmd command="%%PREFIX%%/sbin/3dm2" diff --git a/sysutils/915resolution/files/915resolution.sh.in b/sysutils/915resolution/files/915resolution.sh.in index 4f643fc29208..4878ebfa6f07 100644 --- a/sysutils/915resolution/files/915resolution.sh.in +++ b/sysutils/915resolution/files/915resolution.sh.in @@ -23,7 +23,7 @@ i915resolution_height=${i915resolution_height:-"1080"} # the vertical resolutio . /etc/rc.subr name="i915resolution" -rcvar=`set_rcvar` +rcvar=i915resolution_enable command="%%PREFIX%%/sbin/915resolution" start_cmd="${name}_start" stop_cmd=":" diff --git a/sysutils/LPRng/files/lprng.in b/sysutils/LPRng/files/lprng.in index 0da46aa02d8b..a0e3e6ff05eb 100644 --- a/sysutils/LPRng/files/lprng.in +++ b/sysutils/LPRng/files/lprng.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="lprng" -rcvar=${name}_enable +rcvar=lprng_enable command=%%PREFIX%%/sbin/lpd diff --git a/sysutils/afbinit/files/afbinit.sh.in b/sysutils/afbinit/files/afbinit.sh.in index e9cbbacecb1f..6e23c9799813 100644 --- a/sysutils/afbinit/files/afbinit.sh.in +++ b/sysutils/afbinit/files/afbinit.sh.in @@ -20,7 +20,7 @@ . /etc/rc.subr name="afbinit" -rcvar=${name}_enable +rcvar=afbinit_enable start_cmd="afbinit_startcmd" diff --git a/sysutils/aird/files/aird.in b/sysutils/aird/files/aird.in index 8504bd3e921b..ecd1aa7455bd 100644 --- a/sysutils/aird/files/aird.in +++ b/sysutils/aird/files/aird.in @@ -19,7 +19,7 @@ . /etc/rc.subr name="aird" -rcvar=`set_rcvar` +rcvar=aird_enable load_rc_config $name diff --git a/sysutils/anacron/files/anacron.sh.in b/sysutils/anacron/files/anacron.sh.in index 85e2704ef0a4..918d68703403 100644 --- a/sysutils/anacron/files/anacron.sh.in +++ b/sysutils/anacron/files/anacron.sh.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="anacron" -rcvar=`set_rcvar` +rcvar=anacron_enable command="%%PREFIX%%/sbin/anacron" load_rc_config $name diff --git a/sysutils/apcupsd/files/apcupsd.in b/sysutils/apcupsd/files/apcupsd.in index 4422f8bf5cfb..83ef00ab3aaf 100644 --- a/sysutils/apcupsd/files/apcupsd.in +++ b/sysutils/apcupsd/files/apcupsd.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="apcupsd" -rcvar=${name}_enable +rcvar=apcupsd_enable load_rc_config $name diff --git a/sysutils/asusoled/files/asusoled.sh.in b/sysutils/asusoled/files/asusoled.sh.in index 45f99283f228..b43223339368 100644 --- a/sysutils/asusoled/files/asusoled.sh.in +++ b/sysutils/asusoled/files/asusoled.sh.in @@ -18,7 +18,7 @@ asusoled_command=${asusoled_command-""} . /etc/rc.subr name=asusoled -rcvar=`set_rcvar` +rcvar=asusoled_enable start_cmd=asusoled_start stop_cmd=asusoled_stop diff --git a/sysutils/asusoled/files/oled_clock.sh.in b/sysutils/asusoled/files/oled_clock.sh.in index a8c8c4420bb4..d47d669f0eca 100644 --- a/sysutils/asusoled/files/oled_clock.sh.in +++ b/sysutils/asusoled/files/oled_clock.sh.in @@ -17,7 +17,7 @@ oled_clock_flags=${oled_clock_flags-"-R -i -w -P 1"} . /etc/rc.subr name=oled_clock -rcvar=`set_rcvar` +rcvar=oled_clock_enable start_cmd=oled_clock_start stop_cmd=oled_clock_stop diff --git a/sysutils/ataidle/files/ataidle.in b/sysutils/ataidle/files/ataidle.in index 6218806b024e..928ab02e337f 100644 --- a/sysutils/ataidle/files/ataidle.in +++ b/sysutils/ataidle/files/ataidle.in @@ -23,7 +23,7 @@ . /etc/rc.subr name="ataidle" -rcvar=${name}_enable +rcvar=ataidle_enable command=%%PREFIX%%/sbin/${name} start_cmd=ataidle_start diff --git a/sysutils/atop/files/atop.in b/sysutils/atop/files/atop.in index 0b0e872b8492..9eb224b4997e 100644 --- a/sysutils/atop/files/atop.in +++ b/sysutils/atop/files/atop.in @@ -30,7 +30,7 @@ . /etc/rc.subr name="atop" -rcvar=`set_rcvar` +rcvar=atop_enable load_rc_config $name diff --git a/sysutils/backuppc/files/backuppc.in b/sysutils/backuppc/files/backuppc.in index e82370e4b406..1d9640345d1a 100644 --- a/sysutils/backuppc/files/backuppc.in +++ b/sysutils/backuppc/files/backuppc.in @@ -10,7 +10,7 @@ . /etc/rc.subr name="backuppc" -rcvar=`set_rcvar` +rcvar=backuppc_enable load_rc_config $name diff --git a/sysutils/bacula-server/files/bacula-dir.in b/sysutils/bacula-server/files/bacula-dir.in index dab7df586a3a..45121ab1e13e 100644 --- a/sysutils/bacula-server/files/bacula-dir.in +++ b/sysutils/bacula-server/files/bacula-dir.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="bacula_dir" -rcvar=${name}_enable +rcvar=bacula_dir_enable command=%%PREFIX%%/sbin/bacula-dir load_rc_config $name diff --git a/sysutils/bacula-server/files/bacula-fd.in b/sysutils/bacula-server/files/bacula-fd.in index cf04e503d39c..77d61c495d24 100644 --- a/sysutils/bacula-server/files/bacula-fd.in +++ b/sysutils/bacula-server/files/bacula-fd.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="bacula_fd" -rcvar=${name}_enable +rcvar=bacula_fd_enable command=%%PREFIX%%/sbin/bacula-fd load_rc_config $name diff --git a/sysutils/bacula-server/files/bacula-sd.in b/sysutils/bacula-server/files/bacula-sd.in index d974daac3c13..c8182e28eef3 100644 --- a/sysutils/bacula-server/files/bacula-sd.in +++ b/sysutils/bacula-server/files/bacula-sd.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="bacula_sd" -rcvar=`set_rcvar` +rcvar=bacula_sd_enable command=%%PREFIX%%/sbin/bacula-sd load_rc_config $name diff --git a/sysutils/bacula2-server/files/bacula-dir.in b/sysutils/bacula2-server/files/bacula-dir.in index dab7df586a3a..45121ab1e13e 100644 --- a/sysutils/bacula2-server/files/bacula-dir.in +++ b/sysutils/bacula2-server/files/bacula-dir.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="bacula_dir" -rcvar=${name}_enable +rcvar=bacula_dir_enable command=%%PREFIX%%/sbin/bacula-dir load_rc_config $name diff --git a/sysutils/bacula2-server/files/bacula-fd.in b/sysutils/bacula2-server/files/bacula-fd.in index cf04e503d39c..77d61c495d24 100644 --- a/sysutils/bacula2-server/files/bacula-fd.in +++ b/sysutils/bacula2-server/files/bacula-fd.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="bacula_fd" -rcvar=${name}_enable +rcvar=bacula_fd_enable command=%%PREFIX%%/sbin/bacula-fd load_rc_config $name diff --git a/sysutils/bacula2-server/files/bacula-sd.in b/sysutils/bacula2-server/files/bacula-sd.in index d974daac3c13..c8182e28eef3 100644 --- a/sysutils/bacula2-server/files/bacula-sd.in +++ b/sysutils/bacula2-server/files/bacula-sd.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="bacula_sd" -rcvar=`set_rcvar` +rcvar=bacula_sd_enable command=%%PREFIX%%/sbin/bacula-sd load_rc_config $name diff --git a/sysutils/be_agent/files/be-agent.sh.in b/sysutils/be_agent/files/be-agent.sh.in index 457f31b204ac..2562e6021d61 100644 --- a/sysutils/be_agent/files/be-agent.sh.in +++ b/sysutils/be_agent/files/be-agent.sh.in @@ -14,7 +14,7 @@ . /etc/rc.subr name=be_agent -rcvar=`set_rcvar` +rcvar=be_agent_enable command="%%PREFIX%%/bin/agent.be" diff --git a/sysutils/boxbackup-devel/files/bbackupd.in b/sysutils/boxbackup-devel/files/bbackupd.in index 8e2e3af1bfed..e74a9df86073 100644 --- a/sysutils/boxbackup-devel/files/bbackupd.in +++ b/sysutils/boxbackup-devel/files/bbackupd.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="bbackupd" -rcvar=`set_rcvar` +rcvar=bbackupd_enable load_rc_config $name diff --git a/sysutils/boxbackup-devel/files/bbstored.in b/sysutils/boxbackup-devel/files/bbstored.in index 347af939b7ed..f5163bb165ba 100644 --- a/sysutils/boxbackup-devel/files/bbstored.in +++ b/sysutils/boxbackup-devel/files/bbstored.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="bbstored" -rcvar=`set_rcvar` +rcvar=bbstored_enable load_rc_config $name diff --git a/sysutils/boxbackup/files/bbackupd.in b/sysutils/boxbackup/files/bbackupd.in index fe14fcbc03ec..dcb2c7dc7f66 100644 --- a/sysutils/boxbackup/files/bbackupd.in +++ b/sysutils/boxbackup/files/bbackupd.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="bbackupd" -rcvar=`set_rcvar` +rcvar=bbackupd_enable load_rc_config $name diff --git a/sysutils/boxbackup/files/bbstored.in b/sysutils/boxbackup/files/bbstored.in index 6865c0ee24e3..b77ca0e9c59d 100644 --- a/sysutils/boxbackup/files/bbstored.in +++ b/sysutils/boxbackup/files/bbstored.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="bbstored" -rcvar=`set_rcvar` +rcvar=bbstored_enable load_rc_config $name diff --git a/sysutils/bsd-splash-changer/files/change_splash.sh.in b/sysutils/bsd-splash-changer/files/change_splash.sh.in index af3cb2e36610..f4a5122f69d7 100644 --- a/sysutils/bsd-splash-changer/files/change_splash.sh.in +++ b/sysutils/bsd-splash-changer/files/change_splash.sh.in @@ -1,6 +1,6 @@ #!/bin/sh -# -# /usr/local/etc/rc.d/change_splash.sh * mato [11-feb-2006] + +# $FreeBSD$ # # PROVIDE: change_splash # REQUIRE: mountcritremote @@ -14,19 +14,20 @@ # Splash image file is randomly picked up from this directory. # splash_changer_file (string): Defaults to "/boot/splash". # This is where the image file is copied to. -# . /etc/rc.subr name=change_splash -rcvar=`set_rcvar splash_changer` +rcvar=splash_changer_enable -start_cmd=${name}_start +load_rc_config $name : ${splash_changer_enable="NO"} : ${splash_changer_file="/boot/splash"} : ${splash_changer_dir="%%DATADIR%%"} +start_cmd=${name}_start + change_splash_start() { echo "Changing splash image." @@ -65,7 +66,4 @@ change_splash_start() debug "Boot splash image changed to $filename" } -load_rc_config $name run_rc_command "$1" - -# done diff --git a/sysutils/bsdstats/files/bsdstats.in b/sysutils/bsdstats/files/bsdstats.in index c598733e5cfa..7a21b99e5e4c 100644 --- a/sysutils/bsdstats/files/bsdstats.in +++ b/sysutils/bsdstats/files/bsdstats.in @@ -19,7 +19,7 @@ load_rc_config bsdstats name=bsdstats -rcvar=`set_rcvar` +rcvar=bsdstats_enable command=%%PREFIX%%/etc/periodic/monthly/300.statistics diff --git a/sysutils/cfengine/files/cfexecd.in b/sysutils/cfengine/files/cfexecd.in index 8a5dafb6b4ec..0edae9657b98 100644 --- a/sysutils/cfengine/files/cfexecd.in +++ b/sysutils/cfengine/files/cfexecd.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="cfexecd" -rcvar=${name}_enable +rcvar=cfexecd_enable command="%%PREFIX%%/sbin/${name}" diff --git a/sysutils/cfengine/files/cfservd.in b/sysutils/cfengine/files/cfservd.in index 75528ad60cc2..068c43a32437 100644 --- a/sysutils/cfengine/files/cfservd.in +++ b/sysutils/cfengine/files/cfservd.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="cfservd" -rcvar=${name}_enable +rcvar=cfservd_enable command="%%PREFIX%%/sbin/${name}" diff --git a/sysutils/cfengine3-legacy/files/cf-execd.in b/sysutils/cfengine3-legacy/files/cf-execd.in index 59803d5f7e15..1ee33104e76e 100644 --- a/sysutils/cfengine3-legacy/files/cf-execd.in +++ b/sysutils/cfengine3-legacy/files/cf-execd.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="cf_execd" -rcvar=${name}_enable +rcvar=cf_execd_enable command="%%PREFIX%%/sbin/cf-execd" diff --git a/sysutils/cfengine3-legacy/files/cf-serverd.in b/sysutils/cfengine3-legacy/files/cf-serverd.in index 6f2ac493fbd0..9fbd07cc148a 100644 --- a/sysutils/cfengine3-legacy/files/cf-serverd.in +++ b/sysutils/cfengine3-legacy/files/cf-serverd.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="cf_serverd" -rcvar=${name}_enable +rcvar=cf_serverd_enable command="%%PREFIX%%/sbin/cf-serverd" diff --git a/sysutils/cfengine3/files/cf-execd.in b/sysutils/cfengine3/files/cf-execd.in index 59803d5f7e15..1ee33104e76e 100644 --- a/sysutils/cfengine3/files/cf-execd.in +++ b/sysutils/cfengine3/files/cf-execd.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="cf_execd" -rcvar=${name}_enable +rcvar=cf_execd_enable command="%%PREFIX%%/sbin/cf-execd" diff --git a/sysutils/cfengine3/files/cf-serverd.in b/sysutils/cfengine3/files/cf-serverd.in index 6f2ac493fbd0..9fbd07cc148a 100644 --- a/sysutils/cfengine3/files/cf-serverd.in +++ b/sysutils/cfengine3/files/cf-serverd.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="cf_serverd" -rcvar=${name}_enable +rcvar=cf_serverd_enable command="%%PREFIX%%/sbin/cf-serverd" diff --git a/sysutils/cpupowerd/files/cpupowerd.in b/sysutils/cpupowerd/files/cpupowerd.in index a3f1c6322af6..ad6ee3c0bc17 100644 --- a/sysutils/cpupowerd/files/cpupowerd.in +++ b/sysutils/cpupowerd/files/cpupowerd.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="cpupowerd" -rcvar=`set_rcvar` +rcvar=cpupowerd_enable command=%%PREFIX%%/sbin/${name} start_precmd="${name}_precmd" diff --git a/sysutils/daedalus/files/daedalus.sh b/sysutils/daedalus/files/daedalus.sh index 8dfc3061392a..aa832f041513 100644 --- a/sysutils/daedalus/files/daedalus.sh +++ b/sysutils/daedalus/files/daedalus.sh @@ -12,7 +12,7 @@ . /etc/rc.subr name="daedalus" -rcvar=`set_rcvar` +rcvar=daedalus_enable command="%%PREFIX%%/bin/daedalus.rb" pidfile="/var/run/daedalus.pid" diff --git a/sysutils/daemontools/files/svscan.in b/sysutils/daemontools/files/svscan.in index 840947990a18..b6c9476589d3 100644 --- a/sysutils/daemontools/files/svscan.in +++ b/sysutils/daemontools/files/svscan.in @@ -61,7 +61,7 @@ . /etc/rc.subr name="svscan" -rcvar=`set_rcvar` +rcvar=svscan_enable command="%%PREFIX%%/bin/svscan" # diff --git a/sysutils/devcpu-data/files/microcode_update.in b/sysutils/devcpu-data/files/microcode_update.in index 80b02d302cf1..d7d3c910ef08 100644 --- a/sysutils/devcpu-data/files/microcode_update.in +++ b/sysutils/devcpu-data/files/microcode_update.in @@ -20,7 +20,7 @@ . /etc/rc.subr name="microcode_update" -rcvar=`set_rcvar` +rcvar=microcode_update_enable stop_cmd=":" start_precmd="microcode_update_prepare" start_cmd="microcode_update_start" diff --git a/sysutils/devcpu/files/devcpu.in b/sysutils/devcpu/files/devcpu.in index 957bf1942888..54af29b3405e 100644 --- a/sysutils/devcpu/files/devcpu.in +++ b/sysutils/devcpu/files/devcpu.in @@ -20,7 +20,7 @@ . /etc/rc.subr name="devcpu" -rcvar=`set_rcvar` +rcvar=devcpu_enable stop_cmd=":" start_precmd="devcpu_prepare" start_cmd="devcpu_start" diff --git a/sysutils/diskcheckd/files/diskcheckd.in b/sysutils/diskcheckd/files/diskcheckd.in index a5f719bbd608..847f9a04f76f 100644 --- a/sysutils/diskcheckd/files/diskcheckd.in +++ b/sysutils/diskcheckd/files/diskcheckd.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="diskcheckd" -rcvar=`set_rcvar` +rcvar=diskcheckd_enable command=%%PREFIX%%/sbin/diskcheckd load_rc_config $name diff --git a/sysutils/diskprep/files/diskprep.in b/sysutils/diskprep/files/diskprep.in index d4419c0df00c..c41d01e67705 100644 --- a/sysutils/diskprep/files/diskprep.in +++ b/sysutils/diskprep/files/diskprep.in @@ -1,6 +1,8 @@ #!/bin/sh # $Aero: util/diskprep/diskprep.rc,v 1.1 2005/08/06 00:50:59 brooks Exp $ +# $FreeBSD$ +# # PROVIDE: diskprep # REQUIRE: disks # BEFORE: fsck localswap @@ -9,7 +11,12 @@ . /etc/rc.subr name="diskprep" -rc_var=`set_rcvar` +rcvar=diskprep_enable + +load_rc_config $name + +# Needs default value for _enable ?? + start_precmd="diskprep_prestart" stop_cmd=":" command="/usr/local/sbin/diskprep" @@ -32,6 +39,4 @@ diskprep_prestart() command_args="$command_args $diskprep_disk" } -load_rc_config $name - run_rc_command "$1" diff --git a/sysutils/doinkd/files/doinkd.in b/sysutils/doinkd/files/doinkd.in index 6db9ed88dce5..de35546fe59d 100644 --- a/sysutils/doinkd/files/doinkd.in +++ b/sysutils/doinkd/files/doinkd.in @@ -20,7 +20,7 @@ . /etc/rc.subr name=doinkd -rcvar=`set_rcvar` +rcvar=doinkd_enable command=%%PREFIX%%/sbin/doinkd required_files=%%PREFIX%%/etc/doinkd/doinkd.cf diff --git a/sysutils/downtimed/files/downtimed.in b/sysutils/downtimed/files/downtimed.in index 86fe06bbd3e3..40097b35bb89 100644 --- a/sysutils/downtimed/files/downtimed.in +++ b/sysutils/downtimed/files/downtimed.in @@ -23,7 +23,7 @@ . /etc/rc.subr name="downtimed" -rcvar=`set_rcvar` +rcvar=downtimed_enable command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" diff --git a/sysutils/fcron/files/fcron.in b/sysutils/fcron/files/fcron.in index 14862263d192..0faf39352cff 100644 --- a/sysutils/fcron/files/fcron.in +++ b/sysutils/fcron/files/fcron.in @@ -11,7 +11,7 @@ . /etc/rc.subr name="fcron" -rcvar="`set_rcvar`" +rcvar=fcron_enable command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" diff --git a/sysutils/freqsdwn/files/000.freqshpk.sh.in b/sysutils/freqsdwn/files/000.freqshpk.sh.in index e8475e8c12f7..157c96def200 100644 --- a/sysutils/freqsdwn/files/000.freqshpk.sh.in +++ b/sysutils/freqsdwn/files/000.freqshpk.sh.in @@ -18,7 +18,7 @@ freqshpk_enable=${freqshpk_enable-"NO"} . /etc/rc.subr name=freqshpk -rcvar=`set_rcvar` +rcvar=freqshpk_enable command=%%PREFIX%%/sbin/freqshpk load_rc_config ${name} diff --git a/sysutils/freqsdwn/files/freqshpd.sh.in b/sysutils/freqsdwn/files/freqshpd.sh.in index c360a56d68b5..b3f44ba0000a 100644 --- a/sysutils/freqsdwn/files/freqshpd.sh.in +++ b/sysutils/freqsdwn/files/freqshpd.sh.in @@ -18,7 +18,7 @@ freqshpd_enable=${freqshpd_enable-"NO"} . /etc/rc.subr name=freqshpd -rcvar=`set_rcvar` +rcvar=freqshpd_enable command=%%PREFIX%%/sbin/freqshpd load_rc_config ${name} diff --git a/sysutils/fusefs-kmod/files/fusefs.in b/sysutils/fusefs-kmod/files/fusefs.in index 1ac7ef645ec9..420d87f33bd4 100644 --- a/sysutils/fusefs-kmod/files/fusefs.in +++ b/sysutils/fusefs-kmod/files/fusefs.in @@ -24,9 +24,10 @@ . /etc/rc.subr -kmod="%%PREFIX%%/modules/fuse.ko" name="fusefs" -rcvar=${name}_enable +rcvar=fusefs_enable + +kmod="%%PREFIX%%/modules/fuse.ko" start_cmd="fusefs_start" stop_cmd="fusefs_stop" diff --git a/sysutils/fvcool/files/fvcool.sh.in b/sysutils/fvcool/files/fvcool.sh.in index 2878bf83f159..8d4c0cadc543 100644 --- a/sysutils/fvcool/files/fvcool.sh.in +++ b/sysutils/fvcool/files/fvcool.sh.in @@ -19,7 +19,7 @@ . /etc/rc.subr name="%%PORTNAME%%" -rcvar=`set_rcvar` +rcvar=%%PORTNAME%%_enable command="%%PREFIX%%/sbin/%%PORTNAME%%" command_args="-e" diff --git a/sysutils/ganglia-monitor-core/files/gmetad.sh.in b/sysutils/ganglia-monitor-core/files/gmetad.sh.in index 28175f19298f..77f42fc6bfb2 100644 --- a/sysutils/ganglia-monitor-core/files/gmetad.sh.in +++ b/sysutils/ganglia-monitor-core/files/gmetad.sh.in @@ -8,7 +8,7 @@ . /etc/rc.subr name=gmetad -rcvar=`set_rcvar` +rcvar=gmetad_enable command="%%PREFIX%%/sbin/${name}" start_precmd="gmetad_prestart" stop_postcmd="gmetad_poststop" diff --git a/sysutils/ganglia-monitor-core/files/gmond.sh.in b/sysutils/ganglia-monitor-core/files/gmond.sh.in index 95e78ddefa65..a8f6dbe139de 100644 --- a/sysutils/ganglia-monitor-core/files/gmond.sh.in +++ b/sysutils/ganglia-monitor-core/files/gmond.sh.in @@ -10,7 +10,8 @@ bname=`basename $0` . /etc/rc.subr name=`echo "${bname}" | tr ".-" "__"` -rcvar=`set_rcvar` +rcvar=${name}_enable + command="%%PREFIX%%/sbin/gmond" load_rc_config ganglia diff --git a/sysutils/geomWatch/files/geomWatch.in b/sysutils/geomWatch/files/geomWatch.in index 275d358113c1..58e93f4c76a4 100644 --- a/sysutils/geomWatch/files/geomWatch.in +++ b/sysutils/geomWatch/files/geomWatch.in @@ -19,7 +19,7 @@ geomwatch_pidfile="/var/run/geomWatch.pid" . /etc/rc.subr name="geomwatch" -rcvar=`set_rcvar` +rcvar=geomwatch_enable command="%%PREFIX%%/sbin/geomWatch" load_rc_config $name diff --git a/sysutils/gkrellm2/files/gkrellmd.sh.in b/sysutils/gkrellm2/files/gkrellmd.sh.in index 3ba458e91b90..e588b2a6f54d 100644 --- a/sysutils/gkrellm2/files/gkrellmd.sh.in +++ b/sysutils/gkrellm2/files/gkrellmd.sh.in @@ -22,7 +22,7 @@ gkrellmd_flags=${gkrellmd_flags:-"-d"} # Flags to gkrellmd . /etc/rc.subr name="gkrellmd" -rcvar=`set_rcvar` +rcvar=gkrellmd_enable command="%%PREFIX%%/sbin/${name}" required_files="%%PREFIX%%/etc/${name}.conf" diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in index 97dece85c5ff..0539fef934f4 100644 --- a/sysutils/hal/files/hald.in +++ b/sysutils/hal/files/hald.in @@ -18,7 +18,7 @@ hald_enable=${hald_enable-${gnome_enable}} hald_flags=${hald_flags-""} name=hald -rcvar=`set_rcvar` +rcvar=hald_enable command="%%PREFIX%%/sbin/hald" pidfile="/var/run/${name}/${name}.pid" diff --git a/sysutils/healthd/files/healthd.in b/sysutils/healthd/files/healthd.in index 47a864d79d3d..7e5f3b8db6d1 100644 --- a/sysutils/healthd/files/healthd.in +++ b/sysutils/healthd/files/healthd.in @@ -22,7 +22,7 @@ . /etc/rc.subr name=healthd -rcvar=`set_rcvar` +rcvar=healthd_enable extra_commands="reload" command=%%PREFIX%%/sbin/healthd diff --git a/sysutils/heartbeat/files/heartbeat.in b/sysutils/heartbeat/files/heartbeat.in index 9d227270a98a..980a2e8ce064 100644 --- a/sysutils/heartbeat/files/heartbeat.in +++ b/sysutils/heartbeat/files/heartbeat.in @@ -24,7 +24,7 @@ SUBSYS=heartbeat RUNDIR=@localstatedir@/run name="heartbeat" -rcvar=`set_rcvar` +rcvar=heartbeat_enable load_rc_config $name : ${heartbeat_enable="NO"} diff --git a/sysutils/ipa/files/ipa.in b/sysutils/ipa/files/ipa.in index 2612c6a10316..619df73c9940 100644 --- a/sysutils/ipa/files/ipa.in +++ b/sysutils/ipa/files/ipa.in @@ -21,7 +21,7 @@ . /etc/rc.subr name="ipa" -rcvar=${name}_enable +rcvar=ipa_enable command="%%PREFIX%%/bin/ipa" extra_commands="reload" diff --git a/sysutils/istatd/files/istatd.in b/sysutils/istatd/files/istatd.in index 7dbe680bfba9..73b7be928235 100644 --- a/sysutils/istatd/files/istatd.in +++ b/sysutils/istatd/files/istatd.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="istatd" -rcvar=${name}_enable +rcvar=istatd_enable command=%%PREFIX%%/bin/${name} diff --git a/sysutils/jailrc/files/jailrc.in b/sysutils/jailrc/files/jailrc.in index 06c7834d7a55..d97985f6203c 100644 --- a/sysutils/jailrc/files/jailrc.in +++ b/sysutils/jailrc/files/jailrc.in @@ -11,7 +11,7 @@ . /etc/rc.subr name="jailrc" -rcvar=`set_rcvar` +rcvar=jailrc_enable start_precmd="jail_prestart" start_cmd="jail_start" diff --git a/sysutils/lcdproc/files/LCDd.in b/sysutils/lcdproc/files/LCDd.in index 40fd0e17ab4c..a6077b142dbf 100644 --- a/sysutils/lcdproc/files/LCDd.in +++ b/sysutils/lcdproc/files/LCDd.in @@ -12,7 +12,7 @@ . /etc/rc.subr name="LCDd" -rcvar=${name}_enable +rcvar=LCDd_enable load_rc_config $name diff --git a/sysutils/lcdproc/files/lcdexec.in b/sysutils/lcdproc/files/lcdexec.in index 9b6a323165d5..076499692294 100644 --- a/sysutils/lcdproc/files/lcdexec.in +++ b/sysutils/lcdproc/files/lcdexec.in @@ -12,7 +12,7 @@ . /etc/rc.subr name="lcdexec" -rcvar=`set_rcvar` +rcvar=lcdexec_enable load_rc_config $name diff --git a/sysutils/lcdproc/files/lcdproc.in b/sysutils/lcdproc/files/lcdproc.in index b52fdf791802..3874ef1d75b6 100644 --- a/sysutils/lcdproc/files/lcdproc.in +++ b/sysutils/lcdproc/files/lcdproc.in @@ -12,7 +12,7 @@ . /etc/rc.subr name="lcdproc" -rcvar=${name}_enable +rcvar=lcdproc_enable load_rc_config $name diff --git a/sysutils/lookupd/files/lookupd.in b/sysutils/lookupd/files/lookupd.in index e8ef5c4ec2d9..7a987a12f68f 100644 --- a/sysutils/lookupd/files/lookupd.in +++ b/sysutils/lookupd/files/lookupd.in @@ -18,7 +18,7 @@ . /etc/rc.subr name=lookupd -rcvar=`set_rcvar` +rcvar=lookupd_enable command=%%PREFIX%%/sbin/lookupd diff --git a/sysutils/mbmon/files/mbmon.sh.in b/sysutils/mbmon/files/mbmon.sh.in index 72e7f77e9ee5..a06f60157ae4 100644 --- a/sysutils/mbmon/files/mbmon.sh.in +++ b/sysutils/mbmon/files/mbmon.sh.in @@ -19,7 +19,7 @@ . /etc/rc.subr name="mbmon" -rcvar=`set_rcvar` +rcvar=mbmon_enable # read configuration and set defaults load_rc_config "$name" diff --git a/sysutils/mcollective/files/mcollectived.in b/sysutils/mcollective/files/mcollectived.in index f3f72a442ed8..057259d704ef 100644 --- a/sysutils/mcollective/files/mcollectived.in +++ b/sysutils/mcollective/files/mcollectived.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="mcollectived" -rcvar="${name}_enable" +rcvar=mcollectived_enable load_rc_config "${name}" diff --git a/sysutils/metalog/files/metalog.in b/sysutils/metalog/files/metalog.in index 9cd840d310d7..a1e72aa29298 100644 --- a/sysutils/metalog/files/metalog.in +++ b/sysutils/metalog/files/metalog.in @@ -10,7 +10,7 @@ . /etc/rc.subr name=metalog -rcvar=`set_rcvar` +rcvar=metalog_enable pidfile="/var/run/metalog.pid" command="%%PREFIX%%/sbin/${name}" command_args="--daemonize" diff --git a/sysutils/monit/files/monit.sh.in b/sysutils/monit/files/monit.sh.in index 4a6f55c4be10..83ecd7c959a2 100644 --- a/sysutils/monit/files/monit.sh.in +++ b/sysutils/monit/files/monit.sh.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="monit" -rcvar=`set_rcvar` +rcvar=monit_enable restart_precmd="monit_checkconfig" reload_precmd="monit_checkconfig" diff --git a/sysutils/monitord/files/monitord.in b/sysutils/monitord/files/monitord.in index 8c5033e42100..2f51d4d5e778 100644 --- a/sysutils/monitord/files/monitord.in +++ b/sysutils/monitord/files/monitord.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="monitord" -rcvar=`set_rcvar` +rcvar=monitord_enable load_rc_config $name : ${monitord_enable="NO"} diff --git a/sysutils/monitorix/files/monitorix.in b/sysutils/monitorix/files/monitorix.in index 7db63f440be0..0b317157f537 100644 --- a/sysutils/monitorix/files/monitorix.in +++ b/sysutils/monitorix/files/monitorix.in @@ -12,7 +12,7 @@ monitorix_enable=${monitorix_enable:-"NO"} . /etc/rc.subr name="monitorix" -rcvar=`set_rcvar` +rcvar=monitorix_enable load_rc_config $name diff --git a/sysutils/moosefs-chunkserver/files/mfschunkserver.in b/sysutils/moosefs-chunkserver/files/mfschunkserver.in index d22ecdea135d..c28d9f4770a9 100644 --- a/sysutils/moosefs-chunkserver/files/mfschunkserver.in +++ b/sysutils/moosefs-chunkserver/files/mfschunkserver.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=mfschunkserver -rcvar=`set_rcvar` +rcvar=mfschunkserver_enable command=%%PREFIX%%/sbin/${name} diff --git a/sysutils/moosefs-master/files/mfscgiserv.in b/sysutils/moosefs-master/files/mfscgiserv.in index b5d5657761e3..c447e358ae85 100644 --- a/sysutils/moosefs-master/files/mfscgiserv.in +++ b/sysutils/moosefs-master/files/mfscgiserv.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=mfscgiserv -rcvar=`set_rcvar` +rcvar=mfscgiserv_enable command=%%PREFIX%%/sbin/mfscgiserv diff --git a/sysutils/moosefs-master/files/mfsmaster.in b/sysutils/moosefs-master/files/mfsmaster.in index 35f5e8dcb0f7..fd1f47057cbf 100644 --- a/sysutils/moosefs-master/files/mfsmaster.in +++ b/sysutils/moosefs-master/files/mfsmaster.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=mfsmaster -rcvar=`set_rcvar` +rcvar=mfsmaster_enable command=%%PREFIX%%/sbin/${name} diff --git a/sysutils/moosefs-master/files/mfsmetalogger.in b/sysutils/moosefs-master/files/mfsmetalogger.in index 9e6ff081b4dd..71607d754664 100644 --- a/sysutils/moosefs-master/files/mfsmetalogger.in +++ b/sysutils/moosefs-master/files/mfsmetalogger.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="mfsmetalogger" -rcvar=${name}_enable +rcvar=mfsmetalogger_enable command=%%PREFIX%%/sbin/${name} #pidfile=/var/run/${name}.pid diff --git a/sysutils/msyslog/files/msyslogd.sh.in b/sysutils/msyslog/files/msyslogd.sh.in index 1cdd90a231fd..49a413429ee9 100644 --- a/sysutils/msyslog/files/msyslogd.sh.in +++ b/sysutils/msyslog/files/msyslogd.sh.in @@ -19,7 +19,7 @@ . /etc/rc.subr name=msyslogd -rcvar=`set_rcvar` +rcvar=msyslogd_enable command=%%PREFIX%%/sbin/syslogd pidfile=/var/run/syslog.pid diff --git a/sysutils/munin-node/files/munin-node-revive.sh.in b/sysutils/munin-node/files/munin-node-revive.sh.in index 4de3d93e865d..5da4c067bedc 100644 --- a/sysutils/munin-node/files/munin-node-revive.sh.in +++ b/sysutils/munin-node/files/munin-node-revive.sh.in @@ -10,7 +10,7 @@ . /etc/rc.subr name="munin_node" -rcvar=`set_rcvar` +rcvar=munin_node_enable [ -z "$munin_node_enable" ] && munin_node_enable="NO" [ -z "$munin_node_config" ] && munin_node_config="%%PREFIX%%/etc/munin/munin-node.conf" diff --git a/sysutils/munin-node/files/munin-node.in b/sysutils/munin-node/files/munin-node.in index c51862e68b0d..38f6bf4b3842 100644 --- a/sysutils/munin-node/files/munin-node.in +++ b/sysutils/munin-node/files/munin-node.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="munin_node" -rcvar=`set_rcvar` +rcvar=munin_node_enable [ -z "$munin_node_enable" ] && munin_node_enable="NO" [ -z "$munin_node_config" ] && munin_node_config="%%PREFIX%%/etc/munin/munin-node.conf" diff --git a/sysutils/nagios-statd/files/nagiosstatd.sh.in b/sysutils/nagios-statd/files/nagiosstatd.sh.in index 0d1b57f35835..617f43df4463 100644 --- a/sysutils/nagios-statd/files/nagiosstatd.sh.in +++ b/sysutils/nagios-statd/files/nagiosstatd.sh.in @@ -1,36 +1,33 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: nagiosstatd # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown # -# -# # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable nagiosstatd: # nagiosstatd_enable (bool): Set to "NO" by default. # Set it to "YES" to enable nagiosstatd # nagiosstatd_flags="<set as needed>" -nagiosstatd_enable=${nagiosstatd_enable-"NO"} -nagiosstatd_pidfile=${nagiosstatd_pidfile-"/var/run/nagiosstatd.pid"} - . /etc/rc.subr name="nagiosstatd" -#rcvar=`set_rcvar` -rcvar=${name}_enable +rcvar=nagiosstatd_enable -pidfile="${nagiosstatd_pidfile}" +load_rc_config $name +nagiosstatd_enable=${nagiosstatd_enable-"NO"} +nagiosstatd_pidfile=${nagiosstatd_pidfile-"/var/run/nagiosstatd.pid"} + +pidfile="${nagiosstatd_pidfile}" command=%%PREFIX%%/sbin/nagios-statd command_args="-P ${nagiosstatd_pidfile}" command_interpreter="python" -load_rc_config $name - start_precmd="export PATH=\"$PATH:/usr/local/bin\"" run_rc_command "$1" - diff --git a/sysutils/netdump-server/files/netdump-server.sh.in b/sysutils/netdump-server/files/netdump-server.sh.in index 4e4be03aab78..d61938d74f96 100644 --- a/sysutils/netdump-server/files/netdump-server.sh.in +++ b/sysutils/netdump-server/files/netdump-server.sh.in @@ -1,24 +1,25 @@ #!/bin/sh -# +# $FreeBSD$ +# # PROVIDE: netdump_server -# REQUIRE: -# BEFORE: +# REQUIRE: LOGIN # KEYWORD: shutdown - +# # Add the following line to /etc/rc.conf to enable mpd: # -#netdump_server_enable="YES" +# netdump_server_enable="YES" . /etc/rc.subr +name=netdump_server +rcvar=netdump_server_enable + load_rc_config netdump_server netdump_server_enable=${netdump_server_enable-"NO"} netdump_server_flags=${netdump_server_flags-"--daemon --secure 0"} -name=netdump_server -rcvar=`set_rcvar` command=%%PREFIX%%/bin/netdump-server pidfile=/var/run/netdump-server.pid start_cmd=start_cmd @@ -50,5 +51,4 @@ stop_cmd() fi } -load_rc_config $name run_rc_command "$1" diff --git a/sysutils/nut/files/nut.sh.in b/sysutils/nut/files/nut.sh.in index 1aa66a56732f..98ba6394389c 100644 --- a/sysutils/nut/files/nut.sh.in +++ b/sysutils/nut/files/nut.sh.in @@ -21,7 +21,7 @@ nut_prefix=${nut_prefix-"%%PREFIX%%"} . /etc/rc.subr name="nut" -rcvar=`set_rcvar` +rcvar=nut_enable load_rc_config $name diff --git a/sysutils/nut/files/nut_upslog.sh.in b/sysutils/nut/files/nut_upslog.sh.in index 84b32b413af8..9bb361e1d3be 100644 --- a/sysutils/nut/files/nut_upslog.sh.in +++ b/sysutils/nut/files/nut_upslog.sh.in @@ -24,7 +24,7 @@ nut_upslog_ups=${nut_upslog_ups-"myups@localhost"} . /etc/rc.subr name="nut_upslog" -rcvar=`set_rcvar` +rcvar=nut_upslog_enable load_rc_config $name diff --git a/sysutils/nut/files/nut_upsmon.sh.in b/sysutils/nut/files/nut_upsmon.sh.in index e1836ac174c1..6aee6a46c900 100644 --- a/sysutils/nut/files/nut_upsmon.sh.in +++ b/sysutils/nut/files/nut_upsmon.sh.in @@ -21,7 +21,7 @@ nut_upsmon_prefix=${nut_upsmon_prefix-"%%PREFIX%%"} . /etc/rc.subr name="nut_upsmon" -rcvar=`set_rcvar` +rcvar=nut_upsmon_enable load_rc_config $name diff --git a/sysutils/nut22/files/nut.sh.in b/sysutils/nut22/files/nut.sh.in index 8f6a85b8389e..aaf33c5b18b0 100644 --- a/sysutils/nut22/files/nut.sh.in +++ b/sysutils/nut22/files/nut.sh.in @@ -21,7 +21,7 @@ nut_prefix=${nut_prefix-"%%PREFIX%%"} . /etc/rc.subr name="nut" -rcvar=`set_rcvar` +rcvar=nut_enable load_rc_config $name diff --git a/sysutils/nut22/files/nut_upslog.sh.in b/sysutils/nut22/files/nut_upslog.sh.in index 84b32b413af8..9bb361e1d3be 100644 --- a/sysutils/nut22/files/nut_upslog.sh.in +++ b/sysutils/nut22/files/nut_upslog.sh.in @@ -24,7 +24,7 @@ nut_upslog_ups=${nut_upslog_ups-"myups@localhost"} . /etc/rc.subr name="nut_upslog" -rcvar=`set_rcvar` +rcvar=nut_upslog_enable load_rc_config $name diff --git a/sysutils/nut22/files/nut_upsmon.sh.in b/sysutils/nut22/files/nut_upsmon.sh.in index c047ea2cf8d1..2470e766f186 100644 --- a/sysutils/nut22/files/nut_upsmon.sh.in +++ b/sysutils/nut22/files/nut_upsmon.sh.in @@ -21,7 +21,7 @@ nut_upsmon_prefix=${nut_upsmon_prefix-"%%PREFIX%%"} . /etc/rc.subr name="nut_upsmon" -rcvar=`set_rcvar` +rcvar=nut_upsmon_enable load_rc_config $name diff --git a/sysutils/oak/files/oak.in b/sysutils/oak/files/oak.in index 8cbcef02286e..503728fcbf50 100644 --- a/sysutils/oak/files/oak.in +++ b/sysutils/oak/files/oak.in @@ -12,7 +12,7 @@ oak_enable="${oak_enable-NO}" . /etc/rc.subr name="oak" -rcvar=`set_rcvar` +rcvar=oak_enable command="%%PREFIX%%/bin/oak" load_rc_config $name diff --git a/sysutils/openupsd/files/openupsd.in b/sysutils/openupsd/files/openupsd.in index 73f616f8559f..25fd28d3e088 100644 --- a/sysutils/openupsd/files/openupsd.in +++ b/sysutils/openupsd/files/openupsd.in @@ -11,7 +11,7 @@ openupsd_enable=${openupsd_enable:-"NO"} . /etc/rc.subr name="openupsd" -rcvar=`set_rcvar` +rcvar=openupsd_enable pidfile=/var/run/${name}.pid required_files=%%PREFIX%%/etc/${name}.conf diff --git a/sysutils/p5-Tail-Stat/files/tstatd.in b/sysutils/p5-Tail-Stat/files/tstatd.in index 72ddd33afc28..d627601b4d87 100644 --- a/sysutils/p5-Tail-Stat/files/tstatd.in +++ b/sysutils/p5-Tail-Stat/files/tstatd.in @@ -25,7 +25,7 @@ . /etc/rc.subr name="tstatd" -rcvar=${name}_enable +rcvar=tstatd_enable load_rc_config ${name} diff --git a/sysutils/pcfclock/files/pcfdate.in b/sysutils/pcfclock/files/pcfdate.in index 7a6db74ab67e..0d2f3efc9d3c 100644 --- a/sysutils/pcfclock/files/pcfdate.in +++ b/sysutils/pcfclock/files/pcfdate.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="pcfdate" -rcvar=${name}_enable +rcvar=pcfdate_enable load_rc_config $name diff --git a/sysutils/pfstat/files/pfstatd.in b/sysutils/pfstat/files/pfstatd.in index 3164373ede6d..46ec60534ab2 100644 --- a/sysutils/pfstat/files/pfstatd.in +++ b/sysutils/pfstat/files/pfstatd.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="pfstatd" -rcvar=`set_rcvar` +rcvar=pfstatd_enable command="%%PREFIX%%/bin/${name}" load_rc_config ${name} diff --git a/sysutils/powerman/files/powerman.sh.in b/sysutils/powerman/files/powerman.sh.in index 43ff4d3cd39c..a5e64a218e13 100644 --- a/sysutils/powerman/files/powerman.sh.in +++ b/sysutils/powerman/files/powerman.sh.in @@ -21,7 +21,7 @@ powermand_enable=${powermand_enable:-"NO"} . /etc/rc.subr name="powermand" -rcvar=`set_rcvar` +rcvar=powermand_enable command="%%PREFIX%%/sbin/powermand" required_files="%%PREFIX%%/etc/powerman.conf" diff --git a/sysutils/pprotectd/files/pprotectd.in b/sysutils/pprotectd/files/pprotectd.in index e59e33ae7ee5..438a58327236 100644 --- a/sysutils/pprotectd/files/pprotectd.in +++ b/sysutils/pprotectd/files/pprotectd.in @@ -19,7 +19,7 @@ . /etc/rc.subr name="pprotectd" -rcvar=`set_rcvar` +rcvar=pprotectd_enable load_rc_config "$name" diff --git a/sysutils/puppet/files/puppet.in b/sysutils/puppet/files/puppet.in index 7ffa33d40404..9d1cd480c8b0 100644 --- a/sysutils/puppet/files/puppet.in +++ b/sysutils/puppet/files/puppet.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="puppet" -rcvar=`set_rcvar` +rcvar=puppet_enable load_rc_config "$name" diff --git a/sysutils/puppet/files/puppetmaster.in b/sysutils/puppet/files/puppetmaster.in index 14dd12c57b3c..b525ed0f54eb 100644 --- a/sysutils/puppet/files/puppetmaster.in +++ b/sysutils/puppet/files/puppetmaster.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="puppetmaster" -rcvar=`set_rcvar` +rcvar=puppetmaster_enable load_rc_config "${name}" diff --git a/sysutils/py-bcfg2/files/bcfg2.in b/sysutils/py-bcfg2/files/bcfg2.in index 1236765bcc60..3dba6ca33f5a 100644 --- a/sysutils/py-bcfg2/files/bcfg2.in +++ b/sysutils/py-bcfg2/files/bcfg2.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="bcfg2" -rcvar=${name}_enable +rcvar=bcfg2_enable load_rc_config $name diff --git a/sysutils/py-supervisor/files/supervisord.in b/sysutils/py-supervisor/files/supervisord.in index df4410425b20..e27a952849f9 100644 --- a/sysutils/py-supervisor/files/supervisord.in +++ b/sysutils/py-supervisor/files/supervisord.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="supervisord" -rcvar=`set_rcvar` +rcvar=supervisord_enable command="%%PREFIX%%/bin/${name}" command_interpreter="%%PYTHON_CMD%%" diff --git a/sysutils/radmind/files/radmind.sh.in b/sysutils/radmind/files/radmind.sh.in index d0b0a3d5e327..c0d8ff20f3fe 100644 --- a/sysutils/radmind/files/radmind.sh.in +++ b/sysutils/radmind/files/radmind.sh.in @@ -23,7 +23,7 @@ . /etc/rc.subr name=radmind -rcvar=`set_rcvar` +rcvar=radmind_enable command=%%PREFIX%%/sbin/radmind required_files=%%RADMIND_BASE_DIR%%/config diff --git a/sysutils/rsyncmanager/files/rsyncmanager.sh.in b/sysutils/rsyncmanager/files/rsyncmanager.sh.in index 56781e12c56b..a00eafac24c5 100644 --- a/sysutils/rsyncmanager/files/rsyncmanager.sh.in +++ b/sysutils/rsyncmanager/files/rsyncmanager.sh.in @@ -12,7 +12,7 @@ . /etc/rc.subr name="rsyncmanager" -rcvar=`set_rcvar` +rcvar=rsyncmanager_enable command="%%PREFIX%%/bin/rsyncmanager.rb" pidfile="/var/run/rsyncmanager.pid" diff --git a/sysutils/rsyslog4/files/rsyslogd.in b/sysutils/rsyslog4/files/rsyslogd.in index 6eb1c6d374c2..6186aa15ff34 100644 --- a/sysutils/rsyslog4/files/rsyslogd.in +++ b/sysutils/rsyslog4/files/rsyslogd.in @@ -1,21 +1,25 @@ #!/bin/sh -# + # $FreeBSD$ # - # PROVIDE: rsyslogd # REQUIRE: mountcritremote cleanvar newsyslog ldconfig # BEFORE: SERVERS +# KEYWORD: shutdown . /etc/rc.subr name=rsyslogd -rcvar=`set_rcvar` +rcvar=rsyslogd_enable + command="%%PREFIX%%/sbin/${name}" + load_rc_config $name + : ${rsyslogd_enable:="NO"} : ${rsyslogd_pidfile:="/var/run/rsyslogd.pid"} : ${rsyslogd_config:="%%PREFIX%%/etc/rsyslog.conf"} + pidfile="${rsyslogd_pidfile}" command_args="-i ${pidfile} -f ${rsyslogd_config}" required_files="${rsyslogd_config}" @@ -46,7 +50,7 @@ rsyslogd_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/sysutils/rsyslog5/files/rsyslogd.in b/sysutils/rsyslog5/files/rsyslogd.in index 7fd9b1089b54..8730470c65fc 100644 --- a/sysutils/rsyslog5/files/rsyslogd.in +++ b/sysutils/rsyslog5/files/rsyslogd.in @@ -11,7 +11,7 @@ . /etc/rc.subr name=rsyslogd -rcvar=`set_rcvar` +rcvar=rsyslogd_enable command="%%PREFIX%%/sbin/${name}" load_rc_config $name : ${rsyslogd_enable:="NO"} diff --git a/sysutils/rsyslog6-devel/files/rsyslogd.in b/sysutils/rsyslog6-devel/files/rsyslogd.in index 7fd9b1089b54..8730470c65fc 100644 --- a/sysutils/rsyslog6-devel/files/rsyslogd.in +++ b/sysutils/rsyslog6-devel/files/rsyslogd.in @@ -11,7 +11,7 @@ . /etc/rc.subr name=rsyslogd -rcvar=`set_rcvar` +rcvar=rsyslogd_enable command="%%PREFIX%%/sbin/${name}" load_rc_config $name : ${rsyslogd_enable:="NO"} diff --git a/sysutils/rubygem-chef/files/chef_client.in b/sysutils/rubygem-chef/files/chef_client.in index 924b666cb119..fab7a1b09908 100644 --- a/sysutils/rubygem-chef/files/chef_client.in +++ b/sysutils/rubygem-chef/files/chef_client.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="chef_client" -rcvar=`set_rcvar` +rcvar=chef_client_enable # Read configuration and set defaults load_rc_config $name diff --git a/sysutils/runit/files/runsvdir.sh.in b/sysutils/runit/files/runsvdir.sh.in index 944706da0b56..69e5e8e9aa62 100644 --- a/sysutils/runit/files/runsvdir.sh.in +++ b/sysutils/runit/files/runsvdir.sh.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="runsvdir" -rcvar=`set_rcvar` +rcvar=runsvdir_enable command="%%PREFIX%%/sbin/runsvdir" diff --git a/sysutils/salt/files/salt_master.in b/sysutils/salt/files/salt_master.in index 77b124ae0c29..77d59710149a 100644 --- a/sysutils/salt/files/salt_master.in +++ b/sysutils/salt/files/salt_master.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="salt_master" -rcvar="${name}_enable" +rcvar=salt_master_enable load_rc_config ${name} diff --git a/sysutils/salt/files/salt_minion.in b/sysutils/salt/files/salt_minion.in index 340c6e73cc49..5edb20a06ecb 100644 --- a/sysutils/salt/files/salt_minion.in +++ b/sysutils/salt/files/salt_minion.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="salt_minion" -rcvar="${name}_enable" +rcvar=salt_minion_enable load_rc_config ${name} diff --git a/sysutils/salt/files/salt_syndic.in b/sysutils/salt/files/salt_syndic.in index 991478087377..a3a854befc55 100644 --- a/sysutils/salt/files/salt_syndic.in +++ b/sysutils/salt/files/salt_syndic.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="salt_syndic" -rcvar="${name}_enable" +rcvar=salt_syndic_enable load_rc_config ${name} diff --git a/sysutils/sec/files/sec.in b/sysutils/sec/files/sec.in index 5e51e53f8e5f..2b61c4ad1254 100644 --- a/sysutils/sec/files/sec.in +++ b/sysutils/sec/files/sec.in @@ -22,7 +22,7 @@ . /etc/rc.subr name="sec" -rcvar=`set_rcvar` +rcvar=sec_enable command="%%PREFIX%%/bin/sec" command_args="-detach" diff --git a/sysutils/smartmontools/files/smartd.in b/sysutils/smartmontools/files/smartd.in index 4d4161b33a0d..b90c99666892 100644 --- a/sysutils/smartmontools/files/smartd.in +++ b/sysutils/smartmontools/files/smartd.in @@ -19,7 +19,7 @@ smartd_pidfile="/var/run/smartd.pid" . /etc/rc.subr name="smartd" -rcvar=`set_rcvar` +rcvar=smartd_enable command="%%PREFIX%%/sbin/smartd" load_rc_config $name diff --git a/sysutils/spiped/files/spiped.in b/sysutils/spiped/files/spiped.in index f3cfd26a9b16..49f301d57012 100644 --- a/sysutils/spiped/files/spiped.in +++ b/sysutils/spiped/files/spiped.in @@ -19,7 +19,7 @@ . /etc/rc.subr name="spiped" -rcvar=${name}_enable +rcvar=spiped_enable load_rc_config $name diff --git a/sysutils/swapd/files/swapd.in b/sysutils/swapd/files/swapd.in index f5c2fa446e99..a71ec8240e39 100644 --- a/sysutils/swapd/files/swapd.in +++ b/sysutils/swapd/files/swapd.in @@ -12,7 +12,7 @@ . /etc/rc.subr name=swapd -rcvar=`set_rcvar` +rcvar=swapd_enable command=%%PREFIX%%/sbin/swapd diff --git a/sysutils/swapexd/files/patch-rc.d__swapexd b/sysutils/swapexd/files/patch-rc.d__swapexd index 9d75535c1e3e..4e3c9d8ebbf3 100644 --- a/sysutils/swapexd/files/patch-rc.d__swapexd +++ b/sysutils/swapexd/files/patch-rc.d__swapexd @@ -10,7 +10,7 @@ -start_cmd="swapexd_start" - -load_rc_config $name -+rcvar=`set_rcvar` ++rcvar=swapexd_enable : ${swapexd_enable=NO} diff --git a/sysutils/swapmon/files/swapmon.in b/sysutils/swapmon/files/swapmon.in index 7d1da4b5f111..6f63103976b8 100644 --- a/sysutils/swapmon/files/swapmon.in +++ b/sysutils/swapmon/files/swapmon.in @@ -13,7 +13,7 @@ . /etc/rc.subr name=swapmon -rcvar=`set_rcvar` +rcvar=swapmon_enable command="%%PREFIX%%/sbin/${name}" command_interpreter="/bin/sh" diff --git a/sysutils/symon/files/symon.sh.in b/sysutils/symon/files/symon.sh.in index f63172b858e6..e75de3ed895a 100644 --- a/sysutils/symon/files/symon.sh.in +++ b/sysutils/symon/files/symon.sh.in @@ -7,7 +7,7 @@ . /etc/rc.subr name="symon" -rcvar=`set_rcvar` +rcvar=symon_enable command="%%PREFIX%%/bin/symon" symon_enable=${symon_enable:-"NO"} diff --git a/sysutils/symon/files/symux.sh.in b/sysutils/symon/files/symux.sh.in index 6cecd649cb37..8b2788e3fe24 100644 --- a/sysutils/symon/files/symux.sh.in +++ b/sysutils/symon/files/symux.sh.in @@ -7,7 +7,7 @@ . /etc/rc.subr name="symux" -rcvar=`set_rcvar` +rcvar=symux_enable command="%%PREFIX%%/bin/symux" symux_enable=${symux_enable:-"NO"} diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.sh.in b/sysutils/syslog-ng-devel/files/syslog-ng.sh.in index 1aa03e961357..804bf6ec36fa 100644 --- a/sysutils/syslog-ng-devel/files/syslog-ng.sh.in +++ b/sysutils/syslog-ng-devel/files/syslog-ng.sh.in @@ -21,7 +21,7 @@ syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"} . /etc/rc.subr name=syslog_ng -rcvar=`set_rcvar` +rcvar=syslog_ng_enable command=%%PREFIX%%/sbin/syslog-ng required_files=%%PREFIX%%/etc/syslog-ng.conf diff --git a/sysutils/syslog-ng/files/syslog-ng.sh.in b/sysutils/syslog-ng/files/syslog-ng.sh.in index 1aa03e961357..804bf6ec36fa 100644 --- a/sysutils/syslog-ng/files/syslog-ng.sh.in +++ b/sysutils/syslog-ng/files/syslog-ng.sh.in @@ -21,7 +21,7 @@ syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"} . /etc/rc.subr name=syslog_ng -rcvar=`set_rcvar` +rcvar=syslog_ng_enable command=%%PREFIX%%/sbin/syslog-ng required_files=%%PREFIX%%/etc/syslog-ng.conf diff --git a/sysutils/syslog-ng2/files/syslog-ng.sh.in b/sysutils/syslog-ng2/files/syslog-ng.sh.in index 1aa03e961357..804bf6ec36fa 100644 --- a/sysutils/syslog-ng2/files/syslog-ng.sh.in +++ b/sysutils/syslog-ng2/files/syslog-ng.sh.in @@ -21,7 +21,7 @@ syslog_ng_purgeklog=${syslog_ng_purgeklog-"NO"} . /etc/rc.subr name=syslog_ng -rcvar=`set_rcvar` +rcvar=syslog_ng_enable command=%%PREFIX%%/sbin/syslog-ng required_files=%%PREFIX%%/etc/syslog-ng.conf diff --git a/sysutils/tenshi/files/tenshi.sh.in b/sysutils/tenshi/files/tenshi.sh.in index 821f4a99a5ee..65044ae547b8 100644 --- a/sysutils/tenshi/files/tenshi.sh.in +++ b/sysutils/tenshi/files/tenshi.sh.in @@ -1,21 +1,23 @@ #!/bin/sh -# + # $FreeBSD$ # - # PROVIDE: tenshi # REQUIRE: LOGIN # KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable `tenshi': # -#tenshi_enable="YES" +# Add the following lines to /etc/rc.conf to enable `tenshi': # +# tenshi_enable="YES" . /etc/rc.subr name='tenshi' -rcvar=`set_rcvar` +rcvar=tenshi_enable + +load_rc_config "$name" + +tenshi_enable="${tenshi_enable:-NO}" extra_commands='reload' @@ -26,9 +28,4 @@ pidfile='/var/run/tenshi.pid' required_files='%%PREFIX%%/etc/tenshi.conf' -# set defaults - -tenshi_enable="${tenshi_enable:-NO}" - -load_rc_config "$name" run_rc_command "$1" diff --git a/sysutils/torque/files/pbs_mom.sh.in b/sysutils/torque/files/pbs_mom.sh.in index 54ce27202ceb..07359e11a08e 100644 --- a/sysutils/torque/files/pbs_mom.sh.in +++ b/sysutils/torque/files/pbs_mom.sh.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="pbs_mom" -rcvar=${name}_enable +rcvar=pbs_mom_enable pidfile=/var/spool/torque/mom_priv/mom.lock command=%%PREFIX%%/sbin/${name} diff --git a/sysutils/torque/files/pbs_sched.sh.in b/sysutils/torque/files/pbs_sched.sh.in index 817d8a379146..86df72fbd322 100644 --- a/sysutils/torque/files/pbs_sched.sh.in +++ b/sysutils/torque/files/pbs_sched.sh.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="pbs_sched" -rcvar=${name}_enable +rcvar=pbs_sched_enable pidfile=/var/spool/torque/sched_priv/sched.lock command=%%PREFIX%%/sbin/${name} diff --git a/sysutils/torque/files/pbs_server.sh.in b/sysutils/torque/files/pbs_server.sh.in index be367c7bbcf2..1a639251689e 100644 --- a/sysutils/torque/files/pbs_server.sh.in +++ b/sysutils/torque/files/pbs_server.sh.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="pbs_server" -rcvar=${name}_enable +rcvar=pbs_server_enable pidfile=/var/spool/torque/server_priv/server.lock command=%%PREFIX%%/sbin/${name} diff --git a/sysutils/uhidd/files/uhidd.in b/sysutils/uhidd/files/uhidd.in index f478310e5919..ed478a87564e 100644 --- a/sysutils/uhidd/files/uhidd.in +++ b/sysutils/uhidd/files/uhidd.in @@ -16,7 +16,7 @@ # uhidd stop # stop all uhidd instances. name="uhidd" -rcvar=`set_rcvar` +rcvar=uhidd_enable command="%%PREFIX%%/sbin/${name}" start_cmd="uhidd_start" required_modules="uvhid vkbd" diff --git a/sysutils/upsdaemon/files/upsdaemon.in b/sysutils/upsdaemon/files/upsdaemon.in index 19a1d89374e8..cfbae0808a92 100644 --- a/sysutils/upsdaemon/files/upsdaemon.in +++ b/sysutils/upsdaemon/files/upsdaemon.in @@ -38,7 +38,7 @@ . /etc/rc.subr name=upsdaemon -rcvar=`set_rcvar` +rcvar=upsdaemon_enable command=/usr/local/sbin/upsdaemon diff --git a/sysutils/uptimed/files/uptimed.in b/sysutils/uptimed/files/uptimed.in index 331e70ab6e46..b6650dbb8887 100644 --- a/sysutils/uptimed/files/uptimed.in +++ b/sysutils/uptimed/files/uptimed.in @@ -12,7 +12,7 @@ . /etc/rc.subr name="uptimed" -rcvar=`set_rcvar` +rcvar=uptimed_enable command=%%PREFIX%%/sbin/${name} stop_postcmd="uptimed_poststop" diff --git a/sysutils/usermin/files/usermin.sh.in b/sysutils/usermin/files/usermin.sh.in index b1a8dcaed71d..54c8aebb44d8 100644 --- a/sysutils/usermin/files/usermin.sh.in +++ b/sysutils/usermin/files/usermin.sh.in @@ -15,7 +15,7 @@ usermin_enable=${usermin_enable:-"NO"} . /etc/rc.subr name=usermin -rcvar=`set_rcvar` +rcvar=usermin_enable procname=%%PERL5%% pidfile=/var/log/usermin/miniserv.pid diff --git a/sysutils/volman/files/volmand.in b/sysutils/volman/files/volmand.in index 149b470f33d9..400c8bdb066e 100644 --- a/sysutils/volman/files/volmand.in +++ b/sysutils/volman/files/volmand.in @@ -9,7 +9,7 @@ . /etc/rc.subr name="volmand" -rcvar=`set_rcvar` +rcvar=volmand_enable load_rc_config $name diff --git a/sysutils/watchfolder/files/watchd.in b/sysutils/watchfolder/files/watchd.in index 3d3486c661d8..042452c434bb 100644 --- a/sysutils/watchfolder/files/watchd.in +++ b/sysutils/watchfolder/files/watchd.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="watchd" -rcvar=${name}_enable +rcvar=watchd_enable load_rc_config $name diff --git a/sysutils/webmin/files/webmin.sh.in b/sysutils/webmin/files/webmin.sh.in index f03acd0e185d..8bc39869c77e 100644 --- a/sysutils/webmin/files/webmin.sh.in +++ b/sysutils/webmin/files/webmin.sh.in @@ -15,7 +15,7 @@ webmin_enable=${webmin_enable:-"NO"} . /etc/rc.subr name=webmin -rcvar=`set_rcvar` +rcvar=webmin_enable procname=%%PERL5%% pidfile=/var/log/webmin/miniserv.pid diff --git a/sysutils/xsi/files/xsi.in b/sysutils/xsi/files/xsi.in index e615c95a9ce6..81db8551f04a 100644 --- a/sysutils/xsi/files/xsi.in +++ b/sysutils/xsi/files/xsi.in @@ -17,7 +17,7 @@ xsi_enable=${xsi_enable-"NO"} . /etc/rc.subr name=xsi -rcvar=`set_rcvar` +rcvar=xsi_enable command=%%PREFIX%%/bin/${name} load_rc_config ${name} |