aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Baker <warren@decoy.co.za>2011-09-29 22:54:30 +0200
committerWarren Baker <warren@decoy.co.za>2011-09-29 22:54:30 +0200
commit18c9901c7c94a52b417c66fde315aa13aa0e7abc (patch)
tree3d6d7da334e196e29d5130eee19538ca860b59a7
parent63b21977b98eec6857eb112fbfd3a3267717e3f7 (diff)
parentbf6f1542ec79dcf5e363732f9c902b6bbd4b5535 (diff)
downloadpfsense-packages-18c9901c7c94a52b417c66fde315aa13aa0e7abc.tar.gz
pfsense-packages-18c9901c7c94a52b417c66fde315aa13aa0e7abc.tar.bz2
pfsense-packages-18c9901c7c94a52b417c66fde315aa13aa0e7abc.zip
Merge branch 'master' of github.com:bsdperimeter/pfsense-packages
-rw-r--r--config/open-vm-tools/open-vm-tools.inc1
-rw-r--r--config/open-vm-tools_2/open-vm-tools.inc3
2 files changed, 3 insertions, 1 deletions
diff --git a/config/open-vm-tools/open-vm-tools.inc b/config/open-vm-tools/open-vm-tools.inc
index f963d9b7..5db7de3f 100644
--- a/config/open-vm-tools/open-vm-tools.inc
+++ b/config/open-vm-tools/open-vm-tools.inc
@@ -11,6 +11,7 @@ function open_vm_tools_install() {
$load_conf = file_get_contents("/boot/loader.conf") . "\n";
if(!strstr($load_conf, "vmxnet")) {
$load_conf .= <<<EOFA
+
vmblock_load="YES"
vmmemct_load="YES"
vmhgfs_load="YES"
diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc
index 679eec62..742eaee9 100644
--- a/config/open-vm-tools_2/open-vm-tools.inc
+++ b/config/open-vm-tools_2/open-vm-tools.inc
@@ -11,6 +11,7 @@ function open_vm_tools_install() {
$load_conf = file_get_contents("/boot/loader.conf");
if(!strstr($load_conf, "vmxnet")) {
$load_conf .= <<<EOFA
+
vmblock_load="YES"
vmmemct_load="YES"
vmhgfs_load="YES"
@@ -168,4 +169,4 @@ EOF;
}
-?> \ No newline at end of file
+?>