Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

4 files changed, 68 insertions, 24 deletions

diff --git a/remote/modules/vmware/vmware.build b/remote/modules/vmware/module.build
index 98ee2b8d..98ee2b8d 100644
--- a/remote/modules/vmware/vmware.build
+++ b/remote/modules/vmware/module.build
diff --git a/remote/modules/vmware/module.conf b/remote/modules/vmware/module.conf
new file mode 100644
index 00000000..749a0838
--- /dev/null
+++ b/remote/modules/vmware/module.conf
@@ -0,0 +1,68 @@
+REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/"
+REQUIRED_TYPE="workstation"
+REQUIRED_MODULES="kernel"
+REQUIRED_DIRECTORIES="
+	/etc/vmware
+	/usr/sbin
+	/usr/lib/vmware/bin
+	/usr/lib/vmware/hostd
+	/usr/lib/vmware/icu
+	/usr/lib/vmware/lib
+	/usr/lib/vmware/libconf
+	/usr/lib/vmware/licenses
+	/usr/lib/vmware/resources
+	/usr/lib/vmware/scripts
+	/usr/lib/vmware/share
+	/usr/lib/vmware/xkeymap
+"
+REQUIRED_FILES="
+	/usr/lib/vmware/config
+	/usr/bin/vmware-usbarbitrator
+"
+REQUIRED_BINARIES="
+	vmnet-netifup
+"
+
+REQUIRED_VMWARE_DELETIONS="
+	/var/lib/vmware
+	/etc/vmw*
+	/etc/rc?.d/???vmware*
+	/etc/rc0.d/K06vmware-workstation-server
+	/etc/pam.d/vmware-authd
+	/etc/rc3.d/S25vmamqpd
+	/etc/xdg/menus/applications-merged
+	/etc/init.d/vmamqpd
+	/etc/init.d/vmware*
+	/etc/thnuclnt
+	/etc/cups/thnuclnt.convs
+	/etc/cups/thnuclnt.types
+	/etc/modprobe.d/vmware-fuse.conf
+	/lib/modules/3.11.0-13-generic/misc/vmnet.ko
+	/lib/modules/3.11.0-13-generic/misc/vmmon.ko
+	/usr/share/mime/packages/vmware-player.xml
+	/usr/share/applications/vmware*
+	/usr/share/desktop-directories/vmware-ace-vms.directory
+	/usr/share/man/man1/vmware.1.gz
+	/usr/share/doc/vmware*
+	/usr/share/icons/hicolor/*/mimetypes/application-certificate.png
+	/usr/share/icons/hicolor/*/apps/vmware*
+	/usr/share/icons/hicolor/*/mimetypes/*vmware*
+	/usr/bin/vmnet-dhcpd
+	/usr/bin/ovftool
+	/usr/bin/vmrun
+	/usr/bin/vmware-wssc-adminTool
+	/usr/bin/vmnet-bridge
+	/usr/bin/vmplayer
+	/usr/bin/vmnet-sniffer
+	/usr/bin/vmss2core
+	/usr/bin/vm-support
+	/usr/bin/vmnet-natd
+	/usr/bin/vmnet-netifup
+	/usr/bin/vmware*
+	/usr/include/vmware-vix
+	/usr/lib/libvixAllProducts.so
+	/usr/lib/cups/filter/thnucups
+	/usr/lib/diskLibWrapper.so
+	/usr/lib/vmware*
+	/usr/sbin/vmware*
+"
diff --git a/remote/modules/vmware/vmware.conf.ubuntu b/remote/modules/vmware/module.conf.ubuntu
index c75ee906..c75ee906 100644
--- a/remote/modules/vmware/vmware.conf.ubuntu
+++ b/remote/modules/vmware/module.conf.ubuntu
diff --git a/remote/modules/vmware/vmware.conf b/remote/modules/vmware/vmware.conf
deleted file mode 100644
index 017d1d5b..00000000
--- a/remote/modules/vmware/vmware.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/"
-REQUIRED_TYPE="workstation"
-REQUIRED_MODULES="kernel"
-REQUIRED_DIRECTORIES="
-	/etc/vmware
-	/usr/sbin
-	/usr/lib/vmware/bin
-	/usr/lib/vmware/hostd
-	/usr/lib/vmware/icu
-	/usr/lib/vmware/lib
-	/usr/lib/vmware/libconf
-	/usr/lib/vmware/licenses
-	/usr/lib/vmware/resources
-	/usr/lib/vmware/scripts
-	/usr/lib/vmware/share
-	/usr/lib/vmware/xkeymap
-"
-REQUIRED_FILES="
-	/usr/lib/vmware/config
-	/usr/bin/vmware-usbarbitrator
-"
-REQUIRED_BINARIES="
-	vmnet-netifup
-"