aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/open-vm-tools_2/open-vm-tools.inc46
-rw-r--r--config/open-vm-tools_2/open-vm-tools.xml2
-rw-r--r--pkg_config.10.xml2
3 files changed, 26 insertions, 24 deletions
diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc
index a90f5702..a87d631d 100644
--- a/config/open-vm-tools_2/open-vm-tools.inc
+++ b/config/open-vm-tools_2/open-vm-tools.inc
@@ -9,19 +9,27 @@ 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($load_conf, "vmxnet")) {
+ if(!strstr($load_conf, "vmmemctl")) {
$load_conf .= <<<EOFA
vmblock_load="YES"
-vmmemct_load="YES"
+vmmemctl_load="YES"
vmhgfs_load="YES"
-vmxnet_load="YES"
EOFA;
file_put_contents("/boot/loader.conf", $load_conf);
}
+ $vmware_tools_conf = <<<EOF
+[powerops]
+poweron-script=
+resume-script=
+suspend-script=
+poweroff-script=
+
+EOF;
+
$vmware_guestd = <<<EOF
#!/bin/sh
#
@@ -82,11 +90,6 @@ vmware_guest_vmmemctl_start()
echo 'Loading vmmemctl kernel module.'
kldload /usr/local/lib/vmware-tools/modules/drivers/vmmemctl.ko >/dev/null 2>&1
}
-vmware_guest_vmxnet_start()
-{
- echo 'Loading vmxnet kernel module.'
- kldload /usr/local/lib/vmware-tools/modules/drivers/vmxnet.ko >/dev/null 2>&1
-}
vmware_guest_vmblock_start()
{
echo 'Loading vmblock kernel module.'
@@ -110,18 +113,6 @@ load_rc_config \$name
vmware_guest_vmmemctl_enable="YES"
run_rc_command "\$1"
-# VMware kernel module: vmxnet
-name="vmware_guest_vmxnet"
-rcvar="\${name}_enable"
-start_precmd="\${checkvm_cmd}"
-start_cmd="vmware_guest_vmxnet_start"
-stop_precmd="\${checkvm_cmd}"
-stop_cmd=":"
-
-load_rc_config \$name
-vmware_guest_vmxnet_enable="YES"
-run_rc_command "\$1"
-
# VMware kernel module: vmblock
name="vmware_guest_vmblock"
rcvar="\${name}_enable"
@@ -150,15 +141,26 @@ EOF;
// Write out conf files.
$fd = fopen("/usr/local/etc/rc.d/vmware-guestd.sh", "w");
- if(!$fd)
+ if (!$fd) {
+ log_error("Could not open /usr/local/etc/rc.d/vmware-guestd.sh for writing");
die("Could not open /usr/local/etc/rc.d/vmware-guestd.sh for writing");
+ }
fwrite($fd, $vmware_guestd);
fclose($fd);
$fd = fopen("/usr/local/etc/rc.d/vmware-kmod.sh", "w");
- if(!$fd)
+ if (!$fd) {
+ log_error("Could not open /usr/local/etc/rc.d/vmware-kmod.sh for writing");
die("Could not open /usr/local/etc/rc.d/vmware-kmod.sh for writing");
+ }
fwrite($fd, $vmware_kmod);
fclose($fd);
+ $fd = fopen("/usr/local/share/vmware-tools/tools.conf", "w");
+ if (!$fd) {
+ log_error("Could not open /usr/local/share/vmware-tools/tools.conf for writing");
+ die("Could not open /usr/local/share/vmware-tools/tools.conf for writing");
+ }
+ fwrite($fd, $vmware_tools_conf);
+ fclose($fd);
// Remove non used files
unlink_if_exists("/usr/local/etc/rc.d/vmware-kmod");
diff --git a/config/open-vm-tools_2/open-vm-tools.xml b/config/open-vm-tools_2/open-vm-tools.xml
index 1e823eed..424c8f92 100644
--- a/config/open-vm-tools_2/open-vm-tools.xml
+++ b/config/open-vm-tools_2/open-vm-tools.xml
@@ -8,7 +8,7 @@
/*
open-vm-tools.xml
part of pfSense (http://www.pfSense.org)
- Copyright (C) 2008-2014 Electric Sheep Fencing LP
+ Copyright (C) 2008-2015 Electric Sheep Fencing LP
All rights reserved.
/* ========================================================================== */
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index a535339d..900b8593 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -627,7 +627,7 @@
<descr>VMware Tools</descr>
<website>http://open-vm-tools.sourceforge.net/</website>
<category>Services</category>
- <version>1280544_10</version>
+ <version>1280544_11</version>
<status>Stable</status>
<pkginfolink>https://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink>
<required_version>2.2</required_version>