* Cleaned out some deprecated vmware commands

* We won't build vmware modules in initramfs anymore. They will be on the system
  anyway. This avoids also issues with depmod.
* Directory/URI of the images moved into the vmware plugin


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1565 95ad53e4-c205-0410-b2fa-d234c58c8868

9 files changed, 28 insertions, 39 deletions

diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index ccfcf57b..db3151d9 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -439,9 +439,7 @@ rllinker "ypbind"
 
 # start vmware and vmware preparation services
 config_vmware () {
-rllinker "vmware"
 # during vmware sessions linux should not handle usb events/devices
-testmkd /mnt/var/X11R6/bin
 echo '#!/bin/sh'>> /mnt/etc/udev/rules.d/01-udev-vm.rules
 echo -e "# Script for blocking linux from handling usb \
 devices\n# during vmware sessions. If you like to remove certain modules \
diff --git a/initramfs/distro-specs/suse/functions-10.0 b/initramfs/distro-specs/suse/functions-10.0
index b67df02b..aee86941 100644
--- a/initramfs/distro-specs/suse/functions-10.0
+++ b/initramfs/distro-specs/suse/functions-10.0
@@ -15,9 +15,7 @@
 
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
-rllinker "vmware" 20 2
 # during vmware sessions linux should not handle usb events/devices
-testmkd /mnt/var/X11R6/bin
 echo '#!/bin/sh'> /mnt/var/X11R6/bin/vm-udev
 echo -e "# Script for blocking linux from handling usb \
 devices\n# during vmware sessions. If you like to remove certain modules add \
diff --git a/initramfs/distro-specs/suse/functions-10.1 b/initramfs/distro-specs/suse/functions-10.1
index aa553a2d..5e1ee818 100644
--- a/initramfs/distro-specs/suse/functions-10.1
+++ b/initramfs/distro-specs/suse/functions-10.1
@@ -38,11 +38,9 @@ fi
 
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
-rllinker "vmware" 20 2
 # during vmware sessions linux should not handle usb events/devices
 # vmplayer and recent versions of vmware do not need this hack
 if [ ! -x /mnt/usr/bin/vmplayer ] ; then
-  testmkd /mnt/var/X11R6/bin
   echo '#!/bin/sh'> /mnt/var/X11R6/bin/vm-udev
   echo -e "# Script for blocking linux from handling usb \
 devices\n# during vmware sessions. If you like to remove certain modules \
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2
index 23e36076..eb2ffe82 100644
--- a/initramfs/distro-specs/suse/functions-10.2
+++ b/initramfs/distro-specs/suse/functions-10.2
@@ -90,11 +90,9 @@ fi
 }
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
-rllinker "vmware" 20 2
 # during vmware sessions linux should not handle usb events/devices
 # vmplayer and recent versions of vmware do not need this hack
 if [ ! -x /mnt/usr/bin/vmplayer ] ; then
-  testmkd /mnt/var/X11R6/bin
   echo '#!/bin/sh'> /mnt/var/X11R6/bin/vm-udev
   echo -e "# Script for blocking linux from handling usb \
 devices\n# during vmware sessions. If you like to remove certain modules \
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index 6627c435..a6aa24df 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -497,14 +497,6 @@ else
   error "$df_erryp" nonfatal
 fi
 }
-# start vmware
-config_vmware () {
-if [ -f /mnt/etc/${D_INITDIR}/vmware ] ; then
-  rllinker "vmware" 20 2
-else
-  error "df_errvmw" nonfatal
-fi
-}
 # initialize runlevel skript to be executed during system startup
 # (before most of the normal boot init scripts)
 # this script should operate like a normal runlevel script
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index a327e797..ed727c4c 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -376,9 +376,7 @@ esac
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
 if [ -f /mnt/etc/init.d/vmware ] ; then
-rllinker "vmware" 20 2
 # during vmware sessions linux should not handle usb events/devices
-testmkd /mnt/var/X11R6/bin
 # add special path /var/X11R6/bin to the PATH variable
 # fixme!! add path directly to /etc/profile!?
 echo -e "# added path component by $0: $date\n\
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 285f2d46..28741636 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -1103,10 +1103,6 @@ d_mkrlscript () {
 config_nscd () {
 :
 }
-# prepare virtual machine environment (vmware, vmplayer)
-config_vmware () {
-:
-}
 # configure automounter
 config_automount () {
 :
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 048f0f38..91ff3289 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -75,6 +75,17 @@ sub getAttrInfo
 			content_descr => 'allowed range is from 01-99',
 			default => 70,
 		},
+		# attribute 'imagesrc' defines where we can find vmware images
+		'vmware::imagessrc' => {
+			applies_to_systems => 1,
+			applies_to_clients => 1,
+			description => unshiftHereDoc(<<'			End-of-Here'),
+				Where do we store our vmware images? NFS? Filesystem?
+			End-of-Here
+			content_regex => qr{^\d\d$},
+			content_descr => 'Allowed values: path or URI',
+			default => "",
+		},
 
 	};
 }
@@ -102,14 +113,4 @@ sub preInstallationPhase
 	}
 }
 
-
-sub suggestAdditionalKernelModules
-{
-	my $self                = shift;
-	my $makeInitRamFSEngine = shift;
-
-	# simply suggest these and see where we go from there (what is vmblock?)
-	return qw( vmmon vmnet vmblock );
-}
-
 1;
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index f58b6004..df78cbc3 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -8,7 +8,9 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then
 	# load needed variables
 	. /initramfs/plugin-conf/vmware.conf
 
-	# Test if this plugin is activated
+	# Test if this plugin is activated...
+	# TODO: err... I think we could save this test due of a changed
+	#       plugin system
 	if [ $vmware_active -ne 0 ]; then
 
 		[ $DEBUGLEVEL -gt 0 ] && echo "executing the 'vmware' os-plugin ...";
@@ -33,10 +35,10 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then
 		[ -z "${pool}" ] && pool="default"
 
 		# get source of vmware image server (get type, server and path)
-		if strinstr "/" "${vmware}" ; then
-			vmimgprot=$(uri_token ${vmware} prot)
-		  	vmimgserv=$(uri_token ${vmware} server)
-		  	vmimgpath="$(uri_token ${vmware} path)"
+		if strinstr "/" "${vmware_imagesrc}" ; then
+			vmimgprot=$(uri_token ${vmware_imagesrc} prot)
+		  	vmimgserv=$(uri_token ${vmware_imagesrc} server)
+		  	vmimgpath="$(uri_token ${vmware_imagesrc} path)"
 		fi
 		if [ -n "${vmimgserv}" ] ; then
 			testmkd /mnt/var/lib/vmware
@@ -113,8 +115,16 @@ if [ -e /initramfs/plugin-conf/vmware.conf ]; then
 		# needed for VMware 5.5.3 and versions below
 		echo -e "\tmount -t usbfs usbfs /proc/bus/usb 2>/dev/null" \
 			>>/mnt/etc/${D_INITDIR}/boot.slx
-		# TODO: we still use this function? Prove if we can delete it.
-		config_vmware
+		# config_vmware deprecated?
+		#config_vmware
+		# link /etc/init.d/vmware, so it starts uppon boot
+		if [ -f /mnt/etc/${D_INITDIR}/vmware ] ; then
+			rllinker "vmware" 20 2
+		else
+			error "df_errvmw" nonfatal
+		fi
+
+		
 		chmod 1777 /mnt/var/run/vmware
 		# define a variable where gdm/kdm should look for additional sessions
 		# do we really need it? looks like we can delete it...