aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-05-16 08:35:37 -0400
committerjim-p <jimp@pfsense.org>2011-05-16 08:35:37 -0400
commit340a65182471ca2a6bdadac370ad09d928c700fb (patch)
tree1143ada754a8aaf6ea964a79bc368099c5d330a6
parent02551d6fa8d84dde0320dc3839f525ae03db32a5 (diff)
downloadpfsense-packages-340a65182471ca2a6bdadac370ad09d928c700fb.tar.gz
pfsense-packages-340a65182471ca2a6bdadac370ad09d928c700fb.tar.bz2
pfsense-packages-340a65182471ca2a6bdadac370ad09d928c700fb.zip
Replicate the open-vm-tools fixes into the version of the file used on 2.0
-rw-r--r--config/open-vm-tools_2/open-vm-tools.inc12
1 files changed, 7 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 4844a896..679eec62 100644
--- a/config/open-vm-tools_2/open-vm-tools.inc
+++ b/config/open-vm-tools_2/open-vm-tools.inc
@@ -9,15 +9,17 @@ function open_vm_tools_install() {
if(!file_exists("/boot/loader.conf"))
touch("/boot/loader.conf");
$load_conf = file_get_contents("/boot/loader.conf");
- if(!strstr("vmxnet")) {
- $load_conf .= <<<EOF
+ if(!strstr($load_conf, "vmxnet")) {
+ $load_conf .= <<<EOFA
vmblock_load="YES"
vmmemct_load="YES"
vmhgfs_load="YES"
vmxnet_load="YES"
-EOF;
- file_put_contents("/boot/loader.conf", $load_conf);
- }
+
+EOFA;
+
+ file_put_contents("/boot/loader.conf", $load_conf);
+}
$vmware_guestd = <<<EOF
#!/bin/sh