From 14f241199fde80e9e29b68ca4ceb3c046e7662c7 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 10 Feb 2015 14:34:37 -0200 Subject: Fix rcvar declaration that I broke yesterday and bump necessary package versions --- config/haproxy-devel/haproxy.inc | 2 +- config/haproxy-legacy/haproxy.inc | 2 +- config/haproxy/haproxy.inc | 2 +- config/nrpe2/nrpe2.inc | 2 +- config/open-vm-tools_2/open-vm-tools.inc | 10 +++++----- config/tinydns/tinydns.inc | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index 803d857e..15fbcd17 100644 --- a/config/haproxy-devel/haproxy.inc +++ b/config/haproxy-devel/haproxy.inc @@ -374,7 +374,7 @@ function haproxy_custom_php_install_command() { . /etc/rc.subr name="haproxy" -rcvar="\${name}" +rcvar="\${name}_enable" command="/usr/pbi/haproxy-devel-`uname -m`/sbin/haproxy" haproxy_enable=\${haproxy-"YES"} diff --git a/config/haproxy-legacy/haproxy.inc b/config/haproxy-legacy/haproxy.inc index b6c22899..9058b4a6 100644 --- a/config/haproxy-legacy/haproxy.inc +++ b/config/haproxy-legacy/haproxy.inc @@ -81,7 +81,7 @@ function haproxy_custom_php_install_command() { . /etc/rc.subr name="haproxy" -rcvar="\${name}" +rcvar="\${name}_enable" command="/usr/local/bin/haproxy" haproxy_enable=\${haproxy-"YES"} diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc index 13bdaeab..6d4ba0e5 100644 --- a/config/haproxy/haproxy.inc +++ b/config/haproxy/haproxy.inc @@ -85,7 +85,7 @@ function haproxy_custom_php_install_command() { . /etc/rc.subr name="haproxy" -rcvar="\${name}" +rcvar="\${name}_enable" command="/usr/local/bin/haproxy" haproxy_enable=\${haproxy-"YES"} diff --git a/config/nrpe2/nrpe2.inc b/config/nrpe2/nrpe2.inc index 3fdf2edd..643cb837 100644 --- a/config/nrpe2/nrpe2.inc +++ b/config/nrpe2/nrpe2.inc @@ -127,7 +127,7 @@ function nrpe2_custom_php_install_command() { nrpe2_enable=\${nrpe2_enable-"YES"} name="nrpe2" -rcvar="\${name}" +rcvar="\${name}_enable" command="{$nrpe2_binary}" command_args="-d" diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc index 1b909d34..a90f5702 100644 --- a/config/open-vm-tools_2/open-vm-tools.inc +++ b/config/open-vm-tools_2/open-vm-tools.inc @@ -42,7 +42,7 @@ checkvm_cmd="/usr/local/bin/vmware-checkvm > /dev/null" # VMware guest daemon name="vmware_guestd" -rcvar="\${name}" +rcvar="\${name}_enable" start_precmd="\${checkvm_cmd}" unset start_cmd stop_precmd="\${checkvm_cmd}" @@ -100,7 +100,7 @@ vmware_guest_vmhgfs_start() # VMware kernel module: vmmemctl name="vmware_guest_vmmemctl" -rcvar="\${name}" +rcvar="\${name}_enable" start_precmd="\${checkvm_cmd}" start_cmd="vmware_guest_vmmemctl_start" stop_precmd="\${checkvm_cmd}" @@ -112,7 +112,7 @@ run_rc_command "\$1" # VMware kernel module: vmxnet name="vmware_guest_vmxnet" -rcvar="\${name}" +rcvar="\${name}_enable" start_precmd="\${checkvm_cmd}" start_cmd="vmware_guest_vmxnet_start" stop_precmd="\${checkvm_cmd}" @@ -124,7 +124,7 @@ run_rc_command "\$1" # VMware kernel module: vmblock name="vmware_guest_vmblock" -rcvar="\${name}" +rcvar="\${name}_enable" start_precmd="\${checkvm_cmd}" start_cmd="vmware_guest_vmblock_start" stop_precmd="\${checkvm_cmd}" @@ -136,7 +136,7 @@ run_rc_command "\$1" # VMware kernel module: vmhgfs name="vmware_guest_vmhgfs" -rcvar="\${name}" +rcvar="\${name}_enable" start_precmd="\${checkvm_cmd}" start_cmd="vmware_guest_vmhgfs_start" stop_precmd="\${checkvm_cmd}" diff --git a/config/tinydns/tinydns.inc b/config/tinydns/tinydns.inc index c53926aa..047383ff 100644 --- a/config/tinydns/tinydns.inc +++ b/config/tinydns/tinydns.inc @@ -73,7 +73,7 @@ function tinydns_custom_php_install_command() { . /etc/rc.subr name="svscan" -rcvar="\${name}" +rcvar="\${name}_enable" command="/usr/local/bin/svscan" svscan_enable=\${svscan_enable-"YES"} svscan_servicedir=\${svscan_servicedir-"{$g['varrun_path']}/service"} -- cgit v1.2.3