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')

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