Merge branch 'master' of simonslx:openslx-ng/tm-scripts

12 files changed, 2 insertions, 204 deletions

diff --git a/remote/modules/vmplayer/data/etc/vmware/bootstrap b/remote/modules/vmplayer/data/etc/vmware/bootstrap
deleted file mode 100644
index 9417c7fe..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/bootstrap
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFIX="/usr"
-BINDIR="/usr/bin"
-SBINDIR="/usr/sbin"
-LIBDIR="/usr/lib"
-DATADIR="/usr/share"
-SYSCONFDIR="/etc"
-DOCDIR="/usr/share/doc"
-MANDIR="/usr/share/man"
-INCLUDEDIR="/usr/include"
-INITDIR="/etc/init.d"
-INITSCRIPTDIR="/etc/init.d"
diff --git a/remote/modules/vmplayer/data/etc/vmware/config b/remote/modules/vmplayer/data/etc/vmware/config
index 5a62a179..eb5d01c0 100644
--- a/remote/modules/vmplayer/data/etc/vmware/config
+++ b/remote/modules/vmplayer/data/etc/vmware/config
@@ -1,19 +1,4 @@
 .encoding = "UTF-8"
-NETWORKING = "yes"
-VMBLOCK_CONFED = "no"
-gksu.rootMethod = "su"
+prefvmx.minVmMemPct = "100"
+prefvmx.useRecommendedLockedMemSize = "TRUE"
 libdir = "/usr/lib/vmware"
-VMCI_CONFED = "no"
-VSOCK_CONFED = "no"
-initscriptdir = "/etc/init.d"
-authd.fullpath = "/usr/sbin/vmware-authd"
-bindir = "/usr/bin"
-installerDefaults.componentDownloadEnabled = "yes"
-installerDefaults.autoSoftwareUpdateEnabled.epoch = "4837526839"
-vix.config.version = "1"
-player.product.version = "5.0.2"
-installerDefaults.dataCollectionEnabled.epoch = "9979927113"
-installerDefaults.dataCollectionEnabled = "no"
-installerDefaults.transferVersion = "1"
-installerDefaults.autoSoftwareUpdateEnabled = "no"
-product.buildNumber = "1031769"
diff --git a/remote/modules/vmplayer/data/etc/vmware/icu b/remote/modules/vmplayer/data/etc/vmware/icu
deleted file mode 120000
index d1ebea7d..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/icu
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/vmware/icu
\ No newline at end of file
diff --git a/remote/modules/vmplayer/data/etc/vmware/installer.sh b/remote/modules/vmplayer/data/etc/vmware/installer.sh
deleted file mode 120000
index f178b8cc..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/installer.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/vmware-installer/2.1.0/vmware-uninstall-downgrade
\ No newline at end of file
diff --git a/remote/modules/vmplayer/data/etc/vmware/networking b/remote/modules/vmplayer/data/etc/vmware/networking
deleted file mode 100644
index d2ea7361..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/networking
+++ /dev/null
@@ -1,12 +0,0 @@
-VERSION=1,0
-answer VNET_1_DHCP yes
-answer VNET_1_DHCP_CFG_HASH ABD785E9C7BA236946CF10ED6B15A580E522B13D
-answer VNET_1_HOSTONLY_NETMASK 255.255.255.0
-answer VNET_1_HOSTONLY_SUBNET 172.16.110.0
-answer VNET_1_VIRTUAL_ADAPTER yes
-answer VNET_8_DHCP yes
-answer VNET_8_DHCP_CFG_HASH 5E30544D23705A65173565BC8D6C51008A0F9AF2
-answer VNET_8_HOSTONLY_NETMASK 255.255.255.0
-answer VNET_8_HOSTONLY_SUBNET 192.168.167.0
-answer VNET_8_NAT yes
-answer VNET_8_VIRTUAL_ADAPTER yes
diff --git a/remote/modules/vmplayer/data/etc/vmware/usbarb.rules b/remote/modules/vmplayer/data/etc/vmware/usbarb.rules
deleted file mode 100644
index c3198bb4..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/usbarb.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "version": 1,
-  "rules": []
-}
\ No newline at end of file
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.conf b/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.conf
deleted file mode 100644
index 6aeb3f1e..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Configuration file for ISC 2.0 vmnet-dhcpd operating on vmnet1.
-#
-# This file was automatically generated by the VMware configuration program.
-# See Instructions below if you want to modify it.
-#
-# We set domain-name-servers to make some DHCP clients happy
-# (dhclient as configured in SuSE, TurboLinux, etc.).
-# We also supply a domain name to make pump (Red Hat 6.x) happy.
-#
-
-
-###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" #####
-# Modification Instructions: This section of the configuration file contains
-# information generated by the configuration program. Do not modify this
-# section.
-# You are free to modify everything else. Also, this section must start 
-# on a new line 
-# This file will get backed up with a different name in the same directory 
-# if this section is edited and you try to configure DHCP again.
-
-# Written at: 05/06/2013 17:43:41
-allow unknown-clients;
-default-lease-time 1800;                # default is 30 minutes
-max-lease-time 7200;                    # default is 2 hours
-
-subnet 172.16.110.0 netmask 255.255.255.0 {
-	range 172.16.110.128 172.16.110.254;
-	option broadcast-address 172.16.110.255;
-	option domain-name-servers 172.16.110.1;
-	option domain-name localdomain;
-	default-lease-time 1800;                # default is 30 minutes
-	max-lease-time 7200;                    # default is 2 hours
-}
-host vmnet1 {
-	hardware ethernet 00:50:56:C0:00:01;
-	fixed-address 172.16.110.1;
-	option domain-name-servers 0.0.0.0;
-	option domain-name "";
-}
-####### VMNET DHCP Configuration. End of "DO NOT MODIFY SECTION" #######
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.leases b/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.leases
deleted file mode 100644
index 512c0de2..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.leases
+++ /dev/null
@@ -1,7 +0,0 @@
-# All times in this file are in UTC (GMT), not your local timezone.   This is
-# not a bug, so please don't ask about it.   There is no portable way to
-# store leases in the local timezone, so please don't request this as a
-# feature.   If this is inconvenient or confusing to you, we sincerely
-# apologize.   Seriously, though - don't ask.
-# The format of this file is documented in the dhcpd.leases(5) manual page.
-
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.conf b/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.conf
deleted file mode 100644
index 9f27b6f0..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# Configuration file for ISC 2.0 vmnet-dhcpd operating on vmnet8.
-#
-# This file was automatically generated by the VMware configuration program.
-# See Instructions below if you want to modify it.
-#
-# We set domain-name-servers to make some DHCP clients happy
-# (dhclient as configured in SuSE, TurboLinux, etc.).
-# We also supply a domain name to make pump (Red Hat 6.x) happy.
-#
-
-
-###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" #####
-# Modification Instructions: This section of the configuration file contains
-# information generated by the configuration program. Do not modify this
-# section.
-# You are free to modify everything else. Also, this section must start 
-# on a new line 
-# This file will get backed up with a different name in the same directory 
-# if this section is edited and you try to configure DHCP again.
-
-# Written at: 05/06/2013 17:43:41
-allow unknown-clients;
-default-lease-time 1800;                # default is 30 minutes
-max-lease-time 7200;                    # default is 2 hours
-
-subnet 192.168.167.0 netmask 255.255.255.0 {
-	range 192.168.167.128 192.168.167.254;
-	option broadcast-address 192.168.167.255;
-	option domain-name-servers 192.168.167.2;
-	option domain-name localdomain;
-	default-lease-time 1800;                # default is 30 minutes
-	max-lease-time 7200;                    # default is 2 hours
-	option netbios-name-servers 192.168.167.2;
-	option routers 192.168.167.2;
-}
-host vmnet8 {
-	hardware ethernet 00:50:56:C0:00:08;
-	fixed-address 192.168.167.1;
-	option domain-name-servers 0.0.0.0;
-	option domain-name "";
-	option routers 0.0.0.0;
-}
-####### VMNET DHCP Configuration. End of "DO NOT MODIFY SECTION" #######
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.leases b/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.leases
deleted file mode 100644
index 512c0de2..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.leases
+++ /dev/null
@@ -1,7 +0,0 @@
-# All times in this file are in UTC (GMT), not your local timezone.   This is
-# not a bug, so please don't ask about it.   There is no portable way to
-# store leases in the local timezone, so please don't request this as a
-# feature.   If this is inconvenient or confusing to you, we sincerely
-# apologize.   Seriously, though - don't ask.
-# The format of this file is documented in the dhcpd.leases(5) manual page.
-
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat.mac b/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat.mac
deleted file mode 100644
index 337d094a..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat.mac
+++ /dev/null
@@ -1 +0,0 @@
-00:50:56:E9:43:27
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat/nat.conf b/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat/nat.conf
deleted file mode 100644
index 791f9a7e..00000000
--- a/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat/nat.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# VMware NAT configuration file
-
-[host]
-
-# NAT gateway address
-ip = 192.168.167.2
-netmask = 255.255.255.0
-
-# VMnet device if not specified on command line
-device = /dev/vmnet8
-
-# Allow PORT/EPRT FTP commands (they need incoming TCP stream ...)
-activeFTP = 1
-
-# Allows the source to have any OUI.  Turn this on if you change the OUI
-# in the MAC address of your virtual machines.
-allowAnyOUI = 1
-
-# Controls if (TCP) connections should be reset when the adapter they are
-# bound to goes down
-resetConnectionOnLinkDown = 1
-
-# Controls if (TCP) connection should be reset when guest packet's destination
-# is NAT's IP address
-resetConnectionOnDestLocalHost = 1
-
-[tcp]
-
-# Value of timeout in TCP TIME_WAIT state, in seconds
-timeWaitTimeout = 30
-
-[udp]
-
-# Timeout in seconds. Dynamically-created UDP mappings will purged if
-# idle for this duration of time 0 = no timeout, default = 60; real
-# value might be up to 100% longer
-timeout = 60
-
-[netbios]
-# Timeout for NBNS queries.
-nbnsTimeout = 2
-
-# Number of retries for each NBNS query.
-nbnsRetries = 3
-
-# Timeout for NBDS queries.
-nbdsTimeout = 3
-
-[incomingtcp]
-
-# Use these with care - anyone can enter into your VM through these...
-# The format and example are as follows:
-#<external port number> = <VM's IP address>:<VM's port number>
-#8080 = 172.16.3.128:80
-
-[incomingudp]
-
-# UDP port forwarding example
-#6000 = 172.16.3.0:6001
-