diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-04-27 17:28:59 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-27 17:28:59 -0300 |
| commit | f4aec877f771497bf63314883a96e73a48679c96 (patch) | |
| tree | 5c0dcfa54091efb24e0d10059f232dae2074a848 | |
| parent | d3a371131c4a4faa25d0e89a7a919a946ad6cf76 (diff) | |
| download | pfsense-packages-f4aec877f771497bf63314883a96e73a48679c96.tar.gz pfsense-packages-f4aec877f771497bf63314883a96e73a48679c96.tar.bz2 pfsense-packages-f4aec877f771497bf63314883a96e73a48679c96.zip | |
Sanitize Open-VM-Tools version, add port_category, run_depends and fix pbi checking
| -rw-r--r-- | config/open-vm-tools_2/open-vm-tools.inc | 8 | ||||
| -rw-r--r-- | pkg_config.10.xml | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/config/open-vm-tools_2/open-vm-tools.inc b/config/open-vm-tools_2/open-vm-tools.inc index 5235acde..e36b3e8e 100644 --- a/config/open-vm-tools_2/open-vm-tools.inc +++ b/config/open-vm-tools_2/open-vm-tools.inc @@ -16,7 +16,11 @@ function open_vm_tools_install() { unlink_if_exists("/boot/kernel/vmmemctl.ko"); unlink_if_exists("/boot/kernel/vmxnet.ko"); - $openvmtools_path = "/usr/pbi/open-vm-tools-" . php_uname("m"); + $pfs_version=substr(trim(file_get_contents("/etc/version")),0,3); + if ($pfs_version == "2.1" || $pfs_version == "2.2") + $openvmtools_path = "/usr/pbi/open-vm-tools-" . php_uname("m"); + else + $openvmtools_path = "/usr/local"; // won't copy this either for now, some sequences of loading/unloading of the module will kernel panic. //exec("cp $openvmtools_path/local/lib/vmware-tools/modules/drivers/vmmemctl.ko /boot/kernel/"); @@ -141,4 +145,4 @@ EOF; } -?>
\ No newline at end of file +?> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 9f96ed08..b35d127b 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -690,12 +690,14 @@ <descr>VMware Tools</descr> <website>http://open-vm-tools.sourceforge.net/</website> <category>Services</category> - <version>1280544_9_4</version> + <version>1280544_10</version> <status>Stable</status> <pkginfolink>https://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink> <required_version>2.2</required_version> <config_file>https://packages.pfsense.org/packages/config/open-vm-tools_2/open-vm-tools.xml</config_file> <configurationfile>open-vm-tools.xml</configurationfile> + <port_category>emulators</port_category> + <run_depends>bin/vmtoolsd:emulators/open-vm-tools-nox11</run_depends> <build_pbi> <port>emulators/open-vm-tools-nox11</port> </build_pbi> |