* 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

7 files changed, 0 insertions, 22 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 () {
 :