diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-07-01 18:37:07 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-07-01 18:37:07 -0500 |
| commit | 2c68b4b20bc0709ec485f0292648b50aff3ad098 (patch) | |
| tree | e76d312e6661d691205bee0181ef9e1b75e76552 | |
| parent | b1837b700164ad5be9ec0411cc2d266cfc7a54a6 (diff) | |
| download | pfsense-packages-2c68b4b20bc0709ec485f0292648b50aff3ad098.tar.gz pfsense-packages-2c68b4b20bc0709ec485f0292648b50aff3ad098.tar.bz2 pfsense-packages-2c68b4b20bc0709ec485f0292648b50aff3ad098.zip | |
fix open-vm-tools paths for 2.1x
| -rw-r--r-- | config/open-vm-tools_2/open-vm-tools.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc index 38ee3854..912c4032 100644 --- a/config/open-vm-tools_2/open-vm-tools.inc +++ b/config/open-vm-tools_2/open-vm-tools.inc @@ -20,7 +20,7 @@ function open_vm_tools_install() { if ($pfs_version == "2.1") { $openvmtools_path = "/usr/pbi/open-vm-tools-nox11-" . php_uname("m"); } else if ($pfs_version == "2.2") { - $openvmtools_path = "/usr/pbi/open-vm-tools-" . php_uname("m"); + $openvmtools_path = "/usr/pbi/open-vm-tools-" . php_uname("m") . "/local"; } else { $openvmtools_path = "/usr/local"; } @@ -63,7 +63,7 @@ unset start_cmd stop_precmd="\${checkvm_cmd}" unset stop_cmd command="/usr/local/bin/vmtoolsd" -command_args="-c {$openvmtools_path}/share/vmware-tools/tools.conf -p {$openvmtools_path}/local/lib/open-vm-tools/plugins/vmsvc" +command_args="-c {$openvmtools_path}/share/vmware-tools/tools.conf -p {$openvmtools_path}/lib/open-vm-tools/plugins/vmsvc" pidfile="/var/run/\${name}.pid" load_rc_config \$name @@ -131,10 +131,10 @@ EOF; fclose($fd); */ - $fd = fopen("$openvmtools_path/local/share/vmware-tools/tools.conf", "w"); + $fd = fopen("$openvmtools_path/share/vmware-tools/tools.conf", "w"); if (!$fd) { - log_error("Could not open $openvmtools_path/local/share/vmware-tools/tools.conf for writing"); - die("Could not open $openvmtools_path/local/share/vmware-tools/tools.conf for writing"); + log_error("Could not open $openvmtools_path/share/vmware-tools/tools.conf for writing"); + die("Could not open $openvmtools_path/share/vmware-tools/tools.conf for writing"); } fwrite($fd, $vmware_tools_conf); fclose($fd); |