Cleanup for new style of virtual machine handling (runvware v2, see

#105), vmware-prep is not needed any longer.


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

4 files changed, 0 insertions, 22 deletions

diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index 4165adf9..fbbdee50 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -251,7 +251,6 @@ fi
 # fixme!! taken from SuSE10.0 untested here ...
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
-rllinker "vmware-prep" "22" "02"
 rllinker "vmware" "24" "02"
 # during vmware sessions linux should not handle usb events/devices
 testmkd /mnt/var/X11R6/bin
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index 0c1d9f1a..828f9d69 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -448,7 +448,6 @@ rllinker "ypbind"
 
 # start vmware and vmware preparation services
 config_vmware () {
-rllinker "vmware-prep"
 # ensure that vmware is started after preparation
 rllinker "vmware" "vmware-prep"
 # during vmware sessions linux should not handle usb events/devices
diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default
index b241a8c5..8540e5a2 100644
--- a/initramfs/distro-specs/suse/functions-default
+++ b/initramfs/distro-specs/suse/functions-default
@@ -488,7 +488,6 @@ fi
 # start vmware
 config_vmware () {
 if [ -f /mnt/etc/${D_SYSCONFDIR}/vmware ] ; then
-  rllinker "vmware-prep" "18" "02"
   rllinker "vmware" "20" "02"
   # if running start scripts in parallel vmware-prep is not recognized
   # first solution: just avoid running in parallel
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 37d56c65..d0b86a0a 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -375,12 +375,9 @@ rerun\n# the mkdxsinitrd script to get them applied" \
 esac
 }
 
-# fixme!! taken from SuSE10.0 untested here ...
 # prepare virtual machine environment (vmware, vmplayer)
 config_vmware () {
-if [ -f /mnt/etc/init.d/vmware-prep ] ; then
 if [ -f /mnt/etc/init.d/vmware ] ; then
-rllinker "vmware-prep" "18" "02"
 rllinker "vmware" "20" "02"
 # during vmware sessions linux should not handle usb events/devices
 testmkd /mnt/var/X11R6/bin
@@ -389,22 +386,6 @@ testmkd /mnt/var/X11R6/bin
 echo -e "# added path component by $0: $date\n\
 PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/profile
 echo '#!/bin/sh'>> /mnt/etc/udev/rules.d/01-udev-vm.rules
-# USB stuff
-echo -e "# Script for blocking linux from handling usb \
-devices\n# during vmware sessions. If you like to remove certain modules \
-add them\n# to the list below - Dirk von Suchodoletz, <dirk@goe.net>\n\
-STATE=1\nps aux|grep -i vmware|grep -v \"grep\" &>/dev/null && { STATE=0; \
-/sbin/rmmod usb-storage &>/tmp/null; }\n\
-[ x$ACTION = xremove ] && { [ $STATE = 0 ] && /sbin/rmmod usb-storage \
-&>/dev/null; }\nexit \$STATE" > /mnt/var/X11R6/bin/vm-udev
-chmod u+x /mnt/var/X11R6/bin/vm-udev
-echo -e "# special entry to block linux from reacting to usb events during \
-running\n# vmware sessions, generated by $0 during initramfs\n# Dirk von \
-Suchodoletz, <dirk@goe.net>\nSUBSYSTEM==\"usb\", ACTION==\"add\", \
-PROGRAM=\"/var/X11R6/bin/vm-udev\", OPTIONS=\"ignore_device\"\n\
-SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \
-  >> /mnt/etc/udev/rules.d/01-udev-vm.rules
-fi
 fi
 }