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

3 files changed, 154 insertions, 1 deletions

diff --git a/remote/includes/chroot.inc b/remote/includes/chroot.inc
index fc9738ec..48ad39d3 100644
--- a/remote/includes/chroot.inc
+++ b/remote/includes/chroot.inc
@@ -72,6 +72,18 @@ chroot_gen_autoexec() {
 	# create the script to be automatically executed.
 	cat >"${CHROOT_MOUNTDIR}/autoexec.bat"<<-EOF
 		#!/bin/bash
+		#######################################################
+		#						      #
+		#		    Warning!			      #
+		#						      #
+		#  This	file is only meant to be executed within      #
+		#  the specially chrooted mltk building environment.  # 
+		#						      #
+		#  Do NOT execute it if you are not sure what you do, #
+		#  it may be very harmful if being run in a normal    #
+		#  system environment!				      #
+		#						      #
+		#######################################################
 		echo "chroot started successfully."
 	EOF
 
@@ -128,7 +140,7 @@ chroot_run() {
 	chroot_gen_autoexec || perror "'chroot_gen_autoexec' failed with $?."
 
 	# do the chroot
-	exec 0>&8
+	exec 0>&8		# This redirection is used for debugging within a chroot
 	chroot --userspec root:root "${CHROOT_MOUNTDIR}" /autoexec.bat
 	local RET=$?
 	if [ "$RET" -eq 0 ]; then
diff --git a/remote/modules/vmware/vmware.build b/remote/modules/vmware/vmware.build
index 5d91b02d..98ee2b8d 100644
--- a/remote/modules/vmware/vmware.build
+++ b/remote/modules/vmware/vmware.build
@@ -21,6 +21,8 @@ fetch_source() {
 }
 
 build() {
+	local DELETE_FILES
+	DELETE_FILES=$(for LINE in $REQUIRED_VMWARE_DELETIONS;do echo rm -rf $LINE; done)
 
 	# prepare the build directory with the files needed during the chroot
 	cp "${MODULE_DIR}/src/$VMWARE_BUNDLE_FILE" "${MODULE_BUILD_DIR}/$VMWARE_BUNDLE_FILE"
@@ -31,9 +33,12 @@ build() {
 	
 	pinfo "Installing vmware per chroot..."
 	chroot_run "${MODULE_BUILD_DIR}" <<-EOF
+		# PS1='\[\e[1;33m\](chroot) \u@\h:\w\$ \[\e[1;32m\]' /bin/bash -norc	# un-comment for debugging within chroot
+		$DELETE_FILES
 		yes | sh /"${VMWARE_BUNDLE_FILE}" --eulas-agreed --console --required
 		vmware-modconfig --console --build-mod -k "${SYS_UTS_RELEASE}" vmnet $(which gcc) "${KERNEL_HEADERS_PATH}/include" vmplayer vmnet
 		vmware-modconfig --console --build-mod -k "${SYS_UTS_RELEASE}" vmmon $(which gcc) "${KERNEL_HEADERS_PATH}/include" vmplayer vmmon 
+		# PS1='\[\e[1;33m\](chroot) \u@\h:\w\$ \[\e[1;32m\]' /bin/bash -norc      # un-comment for debugging within chroot
 	EOF
 
 	# cleanup unneeded files
diff --git a/remote/modules/vmware/vmware.conf.ubuntu b/remote/modules/vmware/vmware.conf.ubuntu
new file mode 100644
index 00000000..c75ee906
--- /dev/null
+++ b/remote/modules/vmware/vmware.conf.ubuntu
@@ -0,0 +1,136 @@
+REQUIRED_VMWARE_DELETIONS="
+	/var/lib/vmware
+	/etc/vmware-vix
+	/etc/rc0.d/K08vmware
+	/etc/rc0.d/K06vmware-workstation-server
+	/etc/rc0.d/K06vmamqpd
+	/etc/pam.d/vmware-authd
+	/etc/rc3.d/S19vmware
+	/etc/rc3.d/S55vmware-workstation-server
+	/etc/rc3.d/S25vmamqpd
+	/etc/rc3.d/K08vmware-USBArbitrator
+	/etc/rc3.d/S50vmware-USBArbitrator
+	/etc/rc5.d/K08vmware-USBArbitrator
+	/etc/rc5.d/S50vmware-USBArbitrator
+	/etc/rc2.d/S19vmware
+	/etc/rc2.d/S55vmware-workstation-server
+	/etc/rc2.d/S25vmamqpd
+	/etc/rc2.d/K08vmware-USBArbitrator
+	/etc/rc2.d/S50vmware-USBArbitrator
+	/etc/xdg/menus/applications-merged
+	/etc/rc6.d/K08vmware
+	/etc/rc6.d/K06vmware-workstation-server
+	/etc/rc6.d/K06vmamqpd
+	/etc/rc4.d/S19vmware
+	/etc/rc4.d/S55vmware-workstation-server
+	/etc/rc4.d/S25vmamqpd
+	/etc/init.d/vmamqpd
+	/etc/init.d/vmware-USBArbitrator
+	/etc/init.d/vmware-workstation-server
+	/etc/init.d/vmware
+	/etc/thnuclnt
+	/etc/vmware-installer
+	/etc/cups/thnuclnt.convs
+	/etc/cups/thnuclnt.types
+	/etc/vmware/netmap.conf
+	/etc/vmware/icu
+	/etc/vmware/hostd
+	/etc/vmware/installer.sh
+	/etc/vmware/bootstrap
+	/etc/vmware/ssl
+	/etc/vmware/config
+	/etc/vmware/locations
+	/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-workstation.desktop
+	/usr/share/applications/vmware-player.desktop
+	/usr/share/applications/vmware-netcfg.desktop
+	/usr/share/desktop-directories/vmware-ace-vms.directory
+	/usr/share/man/man1/vmware.1.gz
+	/usr/share/doc/vmware-vix
+	/usr/share/doc/vmware-workstation
+	/usr/share/doc/vmware-player
+	/usr/share/icons/hicolor/32x32/mimetypes/application-certificate.png
+	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-easter-egg.png
+	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-team.png
+	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-vm-legacy.png
+	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-vm-clone.png
+	/usr/share/icons/hicolor/32x32/mimetypes/application-x-vmware-vm.png
+	/usr/share/icons/hicolor/32x32/apps/vmware-player.png
+	/usr/share/icons/hicolor/32x32/apps/vmware-workstation.png
+	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vmfoundry.png
+	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vmdisk.png
+	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-easter-egg.png
+	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-team.png
+	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vm-legacy.png
+	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vm-clone.png
+	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-snapshot.png
+	/usr/share/icons/hicolor/48x48/mimetypes/application-x-vmware-vm.png
+	/usr/share/icons/hicolor/48x48/apps/vmware-player.png
+	/usr/share/icons/hicolor/48x48/apps/vmware-workstation.png
+	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-easter-egg.svg
+	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-team.svg
+	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-vm-clone.svg
+	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-snapshot.svg
+	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-vm-legacy.svg
+	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-vmfoundry.svg
+	/usr/share/icons/hicolor/scalable/mimetypes/application-certificate.svg
+	/usr/share/icons/hicolor/scalable/mimetypes/application-x-vmware-vm.svg
+	/usr/share/icons/hicolor/scalable/apps/vmware-workstation.svg
+	/usr/share/icons/hicolor/16x16/mimetypes/application-certificate.png
+	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-easter-egg.png
+	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-team.png
+	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-vm-legacy.png
+	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-vm-clone.png
+	/usr/share/icons/hicolor/16x16/mimetypes/application-x-vmware-vm.png
+	/usr/share/icons/hicolor/16x16/apps/vmware-player.png
+	/usr/share/icons/hicolor/16x16/apps/vmware-netcfg.png
+	/usr/share/icons/hicolor/16x16/apps/vmware-workstation.png
+	/usr/share/icons/hicolor/24x24/mimetypes
+	/usr/share/icons/hicolor/24x24/apps/vmware-player.png
+	/usr/share/icons/hicolor/24x24/apps/vmware-netcfg.png
+	/usr/share/icons/hicolor/24x24/apps/vmware-workstation.png
+	/usr/bin/vmnet-dhcpd
+	/usr/bin/vmware-unity-helper
+	/usr/bin/ovftool
+	/usr/bin/vmrun
+	/usr/bin/vmware-vim-cmd
+	/usr/bin/vmware-wssc-adminTool
+	/usr/bin/vmnet-bridge
+	/usr/bin/vmplayer
+	/usr/bin/vmnet-sniffer
+	/usr/bin/vmss2core
+	/usr/bin/vmware-usbarbitrator
+	/usr/bin/vmware-netcfg
+	/usr/bin/vmware-modconfig
+	/usr/bin/vmware-tray
+	/usr/bin/vmware-mount
+	/usr/bin/vm-support
+	/usr/bin/vmware-vdiskmanager
+	/usr/bin/vmware-license-enter.sh
+	/usr/bin/vmware-license-check.sh
+	/usr/bin/vmnet-natd
+	/usr/bin/vmware-uninstall
+	/usr/bin/vmware-vprobe
+	/usr/bin/vmware-fuseUI
+	/usr/bin/vmware-installer
+	/usr/bin/vmware-ping
+	/usr/bin/vmware-gksu
+	/usr/bin/vmnet-netifup
+	/usr/bin/vmware-networks
+	/usr/bin/vmware
+	/usr/bin/vmware-hostd
+	/usr/include/vmware-vix
+	/usr/lib/vmware-vix
+	/usr/lib/vmware-ovftool
+	/usr/lib/vmware-installer
+	/usr/lib/libvixAllProducts.so
+	/usr/lib/cups/filter/thnucups
+	/usr/lib/diskLibWrapper.so
+	/usr/lib/vmware
+	/usr/local/share/applications
+	/usr/sbin/vmware-authdlauncher
+	/usr/sbin/vmware-authd
+"