From 307fa02bc2a0920603df7c659aa510ef3819fa2f Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Mon, 27 Jul 2015 18:34:02 +0200
Subject: [vmware] vmware.conf now written with maxhardwareversion, version and
 buildversion of Workstation.

---
 .../opt/openslx/vmchooser/vmware/run-virt.include    | 20 --------------------
 .../data/opt/openslx/vmchooser/vmware/vmware.conf    |  8 --------
 remote/modules/vmware/module.build                   | 19 +++++++++++++++++++
 remote/modules/vmware/module.conf                    |  1 +
 4 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 remote/modules/vmware/data/opt/openslx/vmchooser/vmware/vmware.conf

(limited to 'remote/modules/vmware')

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
index 7788e6a6..ae978036 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include
@@ -378,32 +378,12 @@ pref.vmplayer.confirmOnExit = "TRUE"
 pref.enableAllSharedFolders = "TRUE"
 
 # eula
-
-HEREEND
-	
-	# different eula parameters from Workstation 9+/ Player 5+
-	case "$vmversion" in
-		3.*|4.*|7.*|8.*)
-		cat >> "$vmhome/preferences" <<HEREEND
-pref.eula.size = "2"
-pref.eula.0.appName = "VMware Player"
-pref.eula.0.buildNumber = "$vmbuild"
-pref.eula.1.appName = "VMware Workstation"
-pref.eula.1.buildNumber = "$vmbuild"
-HEREEND
-		;;
-		5.*|9.*)
-			# code
-		cat >> "$vmhome/preferences" <<HEREEND
 pref.eula.count = "2"
 pref.eula0.product = "VMware Player"
 pref.eula0.build = "$vmbuild"
 pref.eula1.product = "VMware Workstation"
 pref.eula1.build = "$vmbuild"
 HEREEND
-		;;
-	esac
-	
 }
 
 
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/vmware.conf b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/vmware.conf
deleted file mode 100644
index 210b814f..00000000
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/vmware.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#configuration file for vmware background services written in stage3 setup
-vmnet0=true
-vmnet1=192.168.101.1/24
-vmnet1nat=true
-vmnet8=192.168.102.1/24
-#stage1 variables produced during plugin install
-version="5.0"
-buildversion="1031769"
diff --git a/remote/modules/vmware/module.build b/remote/modules/vmware/module.build
index 71319d3c..e7c9a2e2 100644
--- a/remote/modules/vmware/module.build
+++ b/remote/modules/vmware/module.build
@@ -84,6 +84,24 @@ build() {
 	rm -rf -- "${MODULE_BUILD_DIR}/usr/lib/vmware-ovftool"
 	unlink "${MODULE_BUILD_DIR}/$VMWARE_BUNDLE_FILE"
 
+	# write vmware.conf config file to be later sourced by vmware/run-virt.include.
+	# This file was formerly stored in data/opt/openslx/vmchooser/vmware/vmware.conf.
+
+	mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/vmchooser/vmware/" || perror "could not mkdir "${MODULE_BUILD_DIR}/opt/openslx/vmchooser/vmware/"."
+
+	OFFICIALVERSION=$(echo "$VMWARE_BUNDLE_FILE" | cut -f 3 -d '-')
+	BUILD_VERSION=$(echo "$VMWARE_BUNDLE_FILE" | cut -f 4 -d '-')
+	
+	cat > "${MODULE_BUILD_DIR}/opt/openslx/vmchooser/vmware/vmware.conf" <<-EOF
+	# configuration file written by vmware/module.build
+	vmnet0=true
+	vmnet1=192.168.101.1/24
+	vmnet1nat=true
+	vmnet8=192.168.102.1/24
+	version=$OFFICIALVERSION
+	buildversion=${BUILD_VERSION%%.*}
+	maxhardwareversion=${OFFICIALVERSION%%.*}
+	EOF
 }
 
 post_copy() {
@@ -98,6 +116,7 @@ post_copy() {
 
 	mkdir -p "$TARGET_BUILD_DIR/lib/modules/vmware/"
 	cp "${MODULE_BUILD_DIR}/lib/modules/$TARGET_KERNEL_LONG/vmplayer/"* "$TARGET_BUILD_DIR/lib/modules/vmware/" || perror "Could not cp vmware modules to target!"
+
 }
 
 parse_patch_name() {
diff --git a/remote/modules/vmware/module.conf b/remote/modules/vmware/module.conf
index 34d16c94..f1398864 100644
--- a/remote/modules/vmware/module.conf
+++ b/remote/modules/vmware/module.conf
@@ -18,6 +18,7 @@ REQUIRED_DIRECTORIES="
 REQUIRED_FILES="
 	/usr/lib/vmware/config
 	/usr/bin/vmware-usbarbitrator
+	/opt/openslx/vmchooser/vmware/vmware.conf
 "
 REQUIRED_BINARIES="
 	vmnet-netifup
-- 
cgit v1.2.3-55-g7522