From 68f4f8a81220341952ec853d4bbcc26db925f30d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 16 Oct 2015 17:53:35 +0200
Subject: [vmware] Try harder to disable updatecheck/datacollection/...

---
 .../vmchooser/vmware/includes/create_vmhome_preferences_file.inc  | 6 ------
 remote/modules/vmware/module.build                                | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'remote/modules/vmware')

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
index c084f224..e33320ad 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc
@@ -10,12 +10,6 @@ create_vmhome_preferences_file() {
 		pref.downloadPermission = "DENY"
 		pref.vmplayer.downloadPermission = "DENY"
 		pref.vmplayer.webUpdateOnStartup = "FALSE"
-		pref.autoSoftwareUpdatePermission = "deny"
-		pref.componentDownloadPermission = "deny"
-		pref.dataCollectionEnabled.epoch = "5828812105"
-		pref.vmplayer.dataCollectionEnabled = "FALSE"
-		pref.autoSoftwareUpdatePermission.epoch = "6559291604"
-		pref.componentDownloadPermission.epoch = ""
 		pref.lastUpdateCheckSec = "$(date +%s)"
 		# hints
 		pref.tip.startup = "FALSE"
diff --git a/remote/modules/vmware/module.build b/remote/modules/vmware/module.build
index 71df1432..878e1b59 100644
--- a/remote/modules/vmware/module.build
+++ b/remote/modules/vmware/module.build
@@ -111,6 +111,14 @@ build() {
 	vmware_build=${BUILD_VERSION}
 	maxhardwareversion=${OFFICIAL_VERSION%%.*}
 	EOF
+
+	# Patch system-wide vmware config
+	sed -i '/^installerDefaults.autoSoftwareUpdateEnabled/d;/^installerDefaults.componentDownloadEnabled/d;/^installerDefaults.dataCollectionEnabled/d' "${MODULE_BUILD_DIR}/etc/vmware/config"
+	cat >> "${MODULE_BUILD_DIR}/etc/vmware/config" <<-HEREDOC
+		installerDefaults.autoSoftwareUpdateEnabled = "no"
+		installerDefaults.componentDownloadEnabled = "no"
+		installerDefaults.dataCollectionEnabled = "no"
+	HEREDOC
 }
 
 post_copy() {
-- 
cgit v1.2.3-55-g7522


From 1ac1dce419122285b4d5743e6a7239e682934230 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 16 Oct 2015 17:55:22 +0200
Subject: [vmware] Unneeded file

---
 remote/modules/vmware/templates/vmware/config | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 remote/modules/vmware/templates/vmware/config

(limited to 'remote/modules/vmware')

diff --git a/remote/modules/vmware/templates/vmware/config b/remote/modules/vmware/templates/vmware/config
deleted file mode 100644
index d8420e0d..00000000
--- a/remote/modules/vmware/templates/vmware/config
+++ /dev/null
@@ -1,24 +0,0 @@
-.encoding = "UTF-8"
-installerDefaults.componentDownloadEnabled = "no"
-installerDefaults.dataCollectionEnabled = "no"
-installerDefaults.transferVersion = "1"
-installerDefaults.autoSoftwareUpdateEnabled = "no"
-NETWORKING = "yes"
-VMBLOCK_CONFED = "yes"
-VMCI_CONFED = "yes"
-VSOCK_CONFED = "yes"
-gksu.rootMethod = "sudo"
-MemTrimRate = "0"
-prefvmx.minVmMemPct = "100"
-prefvmx.useRecommendedLockedMemSize = "TRUE"
-libdir = "/usr/lib/vmware"
-mks.ctlAltDel.ignore = "TRUE"
-mks.fullscreen.allowScreenSaver = "TRUE"
-fullScreenSwitch.onSeparateDesktop = "TRUE"
-msg.autoAnswer = "TRUE"
-authd.fullpath = "/usr/sbin/vmware-authd"
-bindir = "/usr/bin"
-vix.config.version = "1"
-player.product.version = "%PLAYER_VERSION%"
-product.buildNumber = "%BUILD_NUMBER%"
-
-- 
cgit v1.2.3-55-g7522