From 7998273d075385d8a974bd56e530d8753c940717 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 9 Feb 2015 16:28:43 -0200 Subject: Drop use of set_rcvar from startup scripts, it's deprecated --- config/haproxy-devel/haproxy.inc | 2 +- config/haproxy-legacy/haproxy.inc | 2 +- config/haproxy/haproxy.inc | 2 +- config/open-vm-tools_2/open-vm-tools.inc | 10 +++++----- config/tinydns/tinydns.inc | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index fd4262a5..cebe2a51 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=`set_rcvar` +rcvar="\${name}" 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 9f4b4ba6..b6c22899 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=`set_rcvar` +rcvar="\${name}" command="/usr/local/bin/haproxy" haproxy_enable=\${haproxy-"YES"} diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc index 5eb2160e..13bdaeab 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=`set_rcvar` +rcvar="\${name}" command="/usr/local/bin/haproxy" haproxy_enable=\${haproxy-"YES"} diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc index 742eaee9..1b909d34 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=`set_rcvar` +rcvar="\${name}" 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=`set_rcvar` +rcvar="\${name}" 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=`set_rcvar` +rcvar="\${name}" 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=`set_rcvar` +rcvar="\${name}" 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=`set_rcvar` +rcvar="\${name}" 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 8fb6170f..c53926aa 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=`set_rcvar` +rcvar="\${name}" command="/usr/local/bin/svscan" svscan_enable=\${svscan_enable-"YES"} svscan_servicedir=\${svscan_servicedir-"{$g['varrun_path']}/service"} -- cgit v1.2.3