Merge branch 'master' of git@openslx.org:openslx/core

6 files changed, 182 insertions, 623 deletions

diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
index 51361f31..d59227ad 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
@@ -44,190 +44,4 @@ sub initialize
     return 1;
 }
 
-sub fillRunlevelScript
-{
-    my $self     = shift;
-    my $location = shift;
-    my $kind     = shift;
-
-#    my $initfile = newInitFile();
-#    $initfile->addFunction(
-#	'load_modules',
-#        '
-#         # to be filled in via the stage1 configuration script
-#         insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1
-#         insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1
-#         insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0
-#        '
-#        {param => "value"}
-#    );
-#
-#    $initfile->addFunctionCall(
-#	'functionName',
-#        'start', # name of block
-#        {priority => 5, }
-#    );
-#
-#    $initfile->addDaemon("/bin/mydaemon");
-#
-#    my $runlevelscript = getInitFileForDistro($initfile, "ubuntu");
-
-    my $script = unshiftHereDoc(<<"    End-of-Here");
-        #!/bin/sh
-        # completely generic start/stop script, generated via stage1 'vmware' plugin
-        # install
-        # inspiration taken from vmware start script:
-        #   Copyright 1998-2007 VMware, Inc.  All rights reserved.
-        #
-        # This script manages the services needed to run VMware software
-
-        # Basic support for the Linux Standard Base Specification 1.3
-        ### BEGIN INIT INFO
-        # Provides: VMware
-        # Required-Start: \$syslog
-        # Required-Stop:
-        # Default-Start: 2 3 5
-        # Default-Stop: 0 6
-        # Short-Description: Manages the services needed to run VMware software
-        # Description: Manages the services needed to run VMware software
-        ### END INIT INFO
-        load_modules() {
-    End-of-Here
-
-    # Load modules
-    if ($kind eq 'local' || $kind eq 'local25') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-         # to be filled in via the stage1 configuration script
-         insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1
-         insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1
-         insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0
-        End-of-Here
-    } elsif ($kind eq 'vmpl1.0') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-              vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.ko
-              insmod \${module_src_path}/vmnet.ko
-        End-of-Here
-    } elsif ($kind eq "vmpl2.0") {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-              vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.ko
-              insmod \${module_src_path}/vmnet.ko
-              insmod \${module_src_path}/vmblock.ko
-        End-of-Here
-    } elsif ($kind eq 'vmpl2.5') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-              vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.ko
-              insmod \${module_src_path}/vmnet.ko
-              insmod \${module_src_path}/vmblock.ko
-        End-of-Here
-    }
-
-    # unload modules
-    $script .= unshiftHereDoc(<<"    End-of-Here");
-        }
-
-        unload_modules() {
-          # to be filled with the proper list within via the stage1
-          # configuration script
-          rmmod vmmon vmblock vmnet vmmon 2>/dev/null
-
-        }
-    End-of-Here
-
-
-    # setup vmnet0 and vmnet8
-    # depends on specific stage3 setting. I let this if in the code
-    # because else this whole if-reducing process will become more
-    # complicated and the code will get less understandable
-    $script .= unshiftHereDoc(<<"    End-of-Here");
-        # the bridged interface
-        setup_vmnet0() {
-          if [ -n "\$vmnet0" ] ; then
-            # the path might be directly point to the plugin dir
-    End-of-Here
-    if ($kind eq 'vmpl2.5' || $kind eq 'local25') {
-      $script .= "    $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n";
-    } else {
-      $script .= "    $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n";
-    }
-    $script .= unshiftHereDoc(<<"        End-of-Here");
-          fi
-        }
-        # we definately prefer the hostonly interface for NATed operation too
-        # distinction is made via enabled forwarding
-        setup_vmnet1() {
-          if [ -n "\$vmnet1" ] ; then
-            # the path might be directly point to the plugin dir
-            $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \\
-              /dev/vmnet1 vmnet1
-            dhcpif="\$dhcpif vmnet1"
-            ip addr add \$vmnet1 dev vmnet1
-            ip link set vmnet1 up
-            if [ -n "\$vmnet1nat" ] ; then
-              # needs refinement interface name for eth0 is known in stage3 already
-              echo "1" > /proc/sys/net/ipv4/conf/vmnet1/forwarding 2>/dev/null
-              echo "1" > /proc/sys/net/ipv4/conf/eth0/forwarding 2>/dev/null
-              #iptables -A -s vmnet1 -d eth0
-            fi
-            $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet1.conf -lf \\
-              /var/run/vmware/dhcpd-vmnet1.leases \\
-              -pf /var/run/vmnet-dhcpd-vmnet1.pid vmnet1 2>/dev/null # or logfile 
-          fi
-        }
-        # incomplete ...
-        setup_vmnet8() {
-          if [ -n "\$vmnet8" ] ; then
-            #test -c /dev/vmnet8 || mknod c 119 8 /dev/vmnet8
-            $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet8.pid \\
-              /dev/vmnet8 vmnet8
-            ip addr add \$vmnet8 dev vmnet8
-            ip link set vmnet8 up
-            # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50
-            $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \\
-              -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf 2>/dev/null # or logfile 
-            $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet8.conf -lf \\
-              /var/run/vmware/dhcpd-vmnet8.leases \\
-              -pf /var/run/vmnet-dhcpd-vmnet8.pid vmnet8 2>/dev/null # or logfile 
-          fi
-        }
-        case \$1 in
-          start)
-            echo "Starting vmware background services ..."
-            # include default directories
-            . /etc/opt/openslx/openslx.conf
-            # load the configuration file
-            . \${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf
-            load_modules
-            setup_vmnet0
-            setup_vmnet1
-            setup_vmnet8
-          ;;
-          stop)
-            # message output should match the given vendor-os
-            echo "Stopping vmware background services ..."
-            killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \\
-              vmware-tray vmnet-dhcpd 2>/dev/null
-            # wait for shutting down of interfaces... vmnet needs kinda
-            # long
-            sleep 1
-            unload_modules
-          ;;
-          #status)
-          #  echo "Say something useful here ..."
-          #;;
-          restart)
-            "\$0" stop
-            "\$0" start
-          ;;
-        esac
-        exit 0
-        End-of-Here
-    return $script;
-}
-
 1;
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Fedora.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Fedora.pm
index 1c03540f..912bdfa0 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Fedora.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Fedora.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
+# Copyright (c) 2007..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -25,6 +25,5 @@ use OpenSLX::Basics;
 ### interface methods
 ################################################################################
 
-# TODO: implement!
 
 1;
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
index a57e5c8e..2e1197d8 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
@@ -25,178 +25,4 @@ use OpenSLX::Basics;
 ### interface methods
 ################################################################################
 
-sub fillRunlevelScript
-{
-    my $self     = shift;
-    my $location = shift;
-    my $kind     = shift;
-
-    my $script = unshiftHereDoc(<<"    End-of-Here");
-        #!/sbin/runscript
-        # Gentoo compatible (hopefully) start/stop script, generated via stage1 'vmware'
-        # plugin installation
-        #
-        # inspiration taken from vmware start script:
-        #   Copyright 1998-2007 VMware, Inc.  All rights reserved.
-        #
-        # This script manages the services needed to run VMware software
-
-        # dependency definitions
-        depend() {
-        #     use syslog
-        #     need ...
-        }
-
-        # helper functions
-        load_modules() {
-    End-of-Here
-
-    # load modules
-    if ($kind eq 'local' || $kind eq 'local25' || $kind eq 'local30') {
-        if ($kind eq 'local30') {
-            $script .= unshiftHereDoc(<<"            End-of-Here");
-                  # vmplayer 3.0 specific stuff
-                  insmod /lib/modules/\$(uname -r)/misc/vsock.ko || return 1
-                  insmod /lib/modules/\$(uname -r)/misc/vmci.ko || return 1
-            End-of-Here
-        }
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-              # to be filled in via the stage1 configuration script
-              insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1
-              insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1
-              insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0
-        End-of-Here
-    } elsif ($kind eq 'vmpl1.0') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-              vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.ko
-              insmod \${module_src_path}/vmnet.ko
-        End-of-Here
-    } elsif ($kind eq "vmpl2.0") {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-              vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.ko
-              insmod \${module_src_path}/vmnet.ko
-              insmod \${module_src_path}/vmblock.ko
-        End-of-Here
-    } elsif ($kind eq 'vmpl2.5') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-              vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.ko
-              insmod \${module_src_path}/vmnet.ko
-              insmod \${module_src_path}/vmblock.ko
-        End-of-Here
-    } elsif ($kind eq 'vmpl3.0') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-              vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.ko
-              insmod \${module_src_path}/vmnet.ko
-              insmod \${module_src_path}/vmblock.ko
-              insmod \${module_src_path}/vsock.ko
-              insmod \${module_src_path}/vmci.ko
-        End-of-Here
-    }
-
-    # unload modules
-    $script .= unshiftHereDoc(<<"    End-of-Here");
-        }
-
-        unload_modules() {
-          # to be filled with the proper list within via the stage1
-          # configuration script
-          rmmod vmmon vmblock vmnet vmmon vmci vsock 2>/dev/null
-        }
-    End-of-Here
-
-
-
-    # setup vmnet0 and vmnet8
-    # depends on specific stage3 setting. I let this if in the code
-    # because else this whole if-reducing process will become more
-    # complicated and the code will get less understandable
-    $script .= unshiftHereDoc(<<"    End-of-Here");
-        # the bridged interface
-        setup_vmnet0() {
-          if [ -n "\$vmnet0" ] ; then
-            # the path might be directly point to the plugin dir
-    End-of-Here
-    if ($kind eq 'vmpl2.5' || $kind eq 'vmpl3.0' || $kind eq 'local25' || $kind eq 'local30') {
-        $script .= "    $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n";
-    } else {
-        $script .= "    $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n";
-    }
-    $script .= unshiftHereDoc(<<"        End-of-Here");
-          fi
-        }
-        # we definately prefer the hostonly interface for NATed operation too
-        # distinction is made via enabled forwarding
-        setup_vmnet1() {
-          if [ -n "\$vmnet1" ] ; then
-            #test -c /dev/vmnet1 || mknod c 119 1 /dev/vmnet1
-            # the path might be directly point to the plugin dir
-            $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \\
-              /dev/vmnet1 vmnet1
-            dhcpif="\$dhcpif vmnet1"
-            ip addr add \$vmnet1 dev vmnet1
-            ip link set vmnet1 up
-            if [ -n "\$vmnet1nat" ] ; then
-              # needs refinement interface name for eth0 is known in stage3 already
-              echo "1" > /proc/sys/net/ipv4/conf/vmnet1/forwarding 2>/dev/null
-              echo "1" > /proc/sys/net/ipv4/conf/eth0/forwarding 2>/dev/null
-              #iptables -A -s vmnet1 -d eth0
-            fi
-            $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet8.conf \\
-              -lf /var/run/vmware/dhcpd-vmnet1.leases \\
-              -pf /var/run/vmnet-dhcpd-vmnet1.pid vmnet1 2>/dev/null # or logfile 
-          fi
-        }
-        # incomplete ...
-        setup_vmnet8() {
-          if [ -n "\$vmnet8" ] ; then
-            $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet8.pid \\
-              /dev/vmnet8 vmnet8
-            ip addr add \$vmnet8 dev vmnet8
-            ip link set vmnet8 up
-            # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50
-            $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \\
-              -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf 2>/dev/null # or logfile 
-            $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet8.conf \\
-              -lf /var/run/vmware/dhcpd-vmnet8.leases \\
-              -pf /var/run/vmnet-dhcpd-vmnet8.pid vmnet8 2>/dev/null # or logfile 
-          fi
-        }
-
-        # start/stop functions
-        start() {
-            ebegin "Starting vmware background services ..."
-            # include default directories
-            . /etc/opt/openslx/openslx.conf
-            # load the configuration file
-            . \${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf
-            load_modules || eerror "The loading of vmware modules failed"
-            setup_vmnet0 || eerror "Problems setting up vmnet0 interface"
-            setup_vmnet1 || eerror "Problems setting up vmnet1 interface"
-            setup_vmnet8 || eerror "Problems setting up vmnet8 interface"
-            eend $?
-        }
-
-        stop() {
-            # message output should match the given vendor-os
-            ebegin "Stopping vmware background services ..."
-            killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \\
-              vmware-tray vmnet-dhcpd 2>/dev/null
-            # wait for shutting down of interfaces. vmnet needs kinda
-            # long
-            sleep 1
-            unload_modules
-            eend $?
-        }
-        End-of-Here
-    return $script;
-}
-
 1;
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
index 7d22c70d..c1b2ecf4 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 - OpenSLX GmbH
+# Copyright (c) 2008..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -25,209 +25,4 @@ use OpenSLX::Utils;
 ### interface methods
 ################################################################################
 
-sub fillRunlevelScript
-{
-    my $self     = shift;
-    my $location = shift;
-    my $kind     = shift;
-
-    my $script = unshiftHereDoc(<<"    End-of-Here");
-        #!/bin/sh
-        # SuSE compatible start/stop script, generated via stage1 'vmware' plugin
-        # installation
-        #
-        # inspiration taken from vmware start script:
-        #   Copyright 1998-2007 VMware, Inc.  All rights reserved.
-        #
-        # This script manages the services needed to run VMware software
-        
-        # Basic support for the Linux Standard Base Specification 1.3
-        ### BEGIN INIT INFO
-        # Provides: VMware
-        # Required-Start: \$syslog
-        # Required-Stop:
-        # Default-Start: 2 3 5
-        # Default-Stop: 0 6
-        # Short-Description: Manages the services needed to run VMware software
-        # Description: Manages the services needed to run VMware software
-        ### END INIT INFO
-
-        # helper functions
-        load_modules() {
-    End-of-Here
-
-    # Load modules
-    if ($kind eq 'local' || $kind eq 'local25' || $kind eq 'local30') {
-        if ($kind eq 'local30') {
-            $script .= unshiftHereDoc(<<"            End-of-Here");
-                  # vmplayer 3.0 specific stuff
-                  insmod /lib/modules/\$(uname -r)/misc/vsock.ko || return 1
-                  insmod /lib/modules/\$(uname -r)/misc/vmci.ko || return 1
-            End-of-Here
-        }
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-                  # to be filled in via the stage1 configuration script
-                  insmod /lib/modules/\$(uname -r)/misc/vmmon.ko || return 1
-                  insmod /lib/modules/\$(uname -r)/misc/vmnet.ko || return 1
-                  insmod /lib/modules/\$(uname -r)/misc/vmblock.ko 2>/dev/null || return 0
-        End-of-Here
-    } elsif ($kind eq 'vmpl1.0') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-                  vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-                  module_src_path=\${vmware_kind_path}/vmroot/modules
-                  insmod \${module_src_path}/vmmon.ko
-                  insmod \${module_src_path}/vmnet.ko
-        End-of-Here
-    } elsif ($kind eq "vmpl2.0") {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-                  vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-                  module_src_path=\${vmware_kind_path}/vmroot/modules
-                  insmod \${module_src_path}/vmmon.ko
-                  insmod \${module_src_path}/vmnet.ko
-                  insmod \${module_src_path}/vmblock.ko
-        End-of-Here
-    } elsif ($kind eq 'vmpl2.5') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-                  vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-                  module_src_path=\${vmware_kind_path}/vmroot/modules
-                  insmod \${module_src_path}/vmmon.ko
-                  insmod \${module_src_path}/vmnet.ko
-                  insmod \${module_src_path}/vmblock.ko
-        End-of-Here
-    } elsif ($kind eq 'vmpl3.0') {
-        $script .= unshiftHereDoc(<<"        End-of-Here");
-              vmware_kind_path=/opt/openslx/plugin-repo/vmware/${kind}/
-              module_src_path=\${vmware_kind_path}/vmroot/modules
-              insmod \${module_src_path}/vmmon.ko
-              insmod \${module_src_path}/vmnet.ko
-              insmod \${module_src_path}/vmblock.ko
-              insmod \${module_src_path}/vsock.ko
-              insmod \${module_src_path}/vmci.ko
-        End-of-Here
-    }
-
-    # unload modules
-    $script .= unshiftHereDoc(<<"    End-of-Here");
-        }
-
-        unload_modules() {
-          # to be filled with the proper list within via the stage1
-          # configuration script
-          rmmod vmmon vmblock vmnet vmmon vmci vsock 2>/dev/null
-        }
-    End-of-Here
-
-    # setup vmnet0 and vmnet8
-    # depends on specific stage3 setting. A complete rewrite would be
-    # needed (generation of proper runlevel scripts depending on distro
-    # and VMware version, see tickets #211, 290)
-    $script .= unshiftHereDoc(<<"    End-of-Here");
-        # the bridged interface
-        setup_vmnet0() {
-          if [ -n "\$vmnet0" ] ; then
-            # the path might be directly point to the plugin dir
-    End-of-Here
-    if ($kind eq 'vmpl2.5' || $kind eq 'vmpl3.0' || $kind eq 'local25' || $kind eq 'local30') {
-        $script .= "    $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n";
-    } else {
-        $script .= "    $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n";
-    }
-    $script .= unshiftHereDoc(<<"        End-of-Here");
-          fi
-        }
-        # we definately prefer the hostonly interface for NATed operation too
-        # distinction is made via enabled forwarding
-        setup_vmnet1() {
-          if [ -n "\$vmnet1" ] ; then
-            # the path might be directly point to the plugin dir
-            $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \\
-              /dev/vmnet1 vmnet1
-            dhcpif="\$dhcpif vmnet1"
-            ip addr add \$vmnet1 dev vmnet1
-            ip link set vmnet1 up
-            if [ -n "\$vmnet1nat" ] ; then
-              # needs refinement interface name for eth0 is known in stage3 already
-              # available from \$nwif
-              echo "1" > /proc/sys/net/ipv4/conf/vmnet1/forwarding 2>/dev/null
-              echo "1" > /proc/sys/net/ipv4/conf/eth0/forwarding 2>/dev/null
-              #iptables -A -s vmnet1 -d eth0
-            fi
-            $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet1.conf \\
-              -lf /var/run/vmware/dhcpd-vmnet1.leases \\
-              -pf /var/run/vmnet-dhcpd-vmnet1.pid vmnet1 2>/dev/null # or logfile
-          fi
-        }
-        # incomplete ...
-        setup_vmnet8() {
-          if [ -n "\$vmnet8" ] ; then
-            # we don't need the following test. It's handled by
-            # XX_vmware.sh
-            #test -c /dev/vmnet8 || mknod c 119 8 /dev/vmnet8
-            $location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet8.pid \\
-              /dev/vmnet8 vmnet8
-            ip addr add \$vmnet8 dev vmnet8
-            ip link set vmnet8 up
-            # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50
-            $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \\
-              -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf 2>/dev/null # or logfile
-            $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet8.conf \\
-              -lf /var/run/vmware/dhcpd-vmnet8.leases \\
-              -pf /var/run/vmnet-dhcpd-vmnet8.pid vmnet8 2>/dev/null # or logfile
-          fi
-        }
-        # load the helper stuff
-        . /etc/rc.status
-        # reset the script status
-        rc_reset
-    
-        case \$1 in
-          start)
-            echo -n "Starting vmware background services ..."
-            # include default directories
-            . /etc/opt/openslx/openslx.conf
-            # load the configuration file
-            . \${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf
-            # hack to access the first serial/parallel port
-            chmod a+rw /dev/ttyS0
-            chmod a+rw /dev/parport0
-            load_modules
-            setup_vmnet0
-            setup_vmnet1
-            setup_vmnet8
-            rc_status -v
-          ;;
-          stop)
-            # message output should match the given vendor-os
-            echo -n "Stopping vmware background services ..."
-            killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \\
-              vmware-tray vmnet-dhcpd 2>/dev/null
-            # wait for shutting down of interfaces. vmnet needs kinda
-            # long
-            sleep 1
-            unload_modules
-            # workaround, because we can kill and unload more as we have
-            # started
-            rc_reset
-            rc_status -v
-          ;;
-          # we don't need a status yet... at least as long as it is
-          # unclear in which path the corresponding binary (see original
-          # /etc/init.d/vmware) is in our case
-          #status)
-          #  echo -n "Say something useful here ..."
-          #;;
-          restart)
-            "\$0" stop
-            "\$0" start
-          ;;
-          *)
-            echo "Usage: `basename "\$0"` {start|stop|restart}"
-            exit 1
-         ;;
-        esac
-        exit 0
-        End-of-Here
-    return $script;
-}
-
 1;
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Ubuntu.pm
index d7ffc2e5..922fb34f 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Ubuntu.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2007 - OpenSLX GmbH
+# Copyright (c) 2007..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 1a4540f0..4ebaa2b6 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2009 - OpenSLX GmbH
+# Copyright (c) 2008..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -23,6 +23,7 @@ use File::Path;
 
 use OpenSLX::Basics;
 use OpenSLX::Utils;
+use OpenSLX::DistroUtils;
 
 sub new
 {
@@ -131,12 +132,12 @@ sub getAttrInfo
             applies_to_clients => 1,
             description => unshiftHereDoc(<<'            End-of-Here'),
                 Which set of VMware binaries to use: installed (local) or provided by the
-                plugin itself (vmpl1.0, vmpl2.0, vmpl2.5)?
+                plugin itself (vmpl1.0, vmpl2.0, vmpl2.5, vmpl3.0)?
             End-of-Here
             # only allow the supported once...
             # TODO: modify if we know which of them work
             #content_regex => qr{^(local|vmws(5\.5|6.0)|vmpl(1\.0|2\.0))$},
-            content_regex => qr{^(local|vmpl2\.0|vmpl1\.0|vmpl2\.5)$},
+            content_regex => qr{^(local|vmpl3\.0||vmpl2\.0|vmpl1\.0|vmpl2\.5)$},
             content_descr => 'Allowed values: local, vmpl2.0',
             #TODO: what if we don't have a local installation. default
             #      is still local. Someone has a clue how to test
@@ -255,7 +256,6 @@ sub preInstallationPhase()
     }
 }
 
-
 sub installationPhase
 {
     my $self = shift;
@@ -300,6 +300,7 @@ sub installationPhase
     if (-e "/usr/bin/vmware" && ! -e "/usr/bin/vmware.slx-bak") {
         rename("/usr/bin/vmware", "/usr/bin/vmware.slx-bak");
     }
+
 }
 
 sub removalPhase
@@ -325,9 +326,7 @@ sub checkStage3AttrValues
     my $vendorOSAttrs = shift;
     my @problems;
 
-    my $vm_kind = $stage3Attrs->{'vmware::kind'} || '';
-    
-    
+    my $vm_kind = $stage3Attrs->{'vmware::kind'} || '';    
     my $vmimg = $stage3Attrs->{'vmware::imagesrc'} || '';
 
     if ($vm_kind eq 'local' && ! -x "/usr/lib/vmware/bin/vmplayer") {
@@ -343,6 +342,13 @@ sub checkStage3AttrValues
         );
     }
 
+    if ($vm_kind eq 'vmpl1.0' &&
+        ! -d "/opt/openslx/plugin-repo/vmware/vmpl1.0/vmroot") {
+        push @problems, _tr(
+            "No OpenSLX installation of VMware Player 1 found or installation failed. Using it as virtual machine wouldn't work!"
+        );
+    }
+
     if ($vm_kind eq 'vmpl2.0' &&
         ! -d "/opt/openslx/plugin-repo/vmware/vmpl2.0/vmroot") {
         push @problems, _tr(
@@ -357,10 +363,10 @@ sub checkStage3AttrValues
         );
     }
 
-    if ($vm_kind eq 'vmpl1.0' &&
-        ! -d "/opt/openslx/plugin-repo/vmware/vmpl1.0/vmroot") {
+    if ($vm_kind eq 'vmpl3.0' &&
+        ! -d "/opt/openslx/plugin-repo/vmware/vmpl3.0/vmroot") {
         push @problems, _tr(
-            "No OpenSLX installation of VMware Player 1 found or installation failed. Using it as virtual machine wouldn't work!"
+            "No OpenSLX installation of VMware Player 3 found or installation failed. Using it as virtual machine wouldn't work!"
         );
     }
 
@@ -374,21 +380,143 @@ sub checkStage3AttrValues
 ## local, non-general OpenSLX functions
 #######################################
 
-# write the runlevelscript depending on the version
+# Write the runlevelscript
+# usage: _writeRunlevelScript("$vmpath", "$kind")
 sub _writeRunlevelScript
 {
     my $self     = shift;
-    my $location = shift;
-    my $file     = shift;
+    my $vmpath   = shift;
     my $kind     = shift;
-    
-    # $location points to the path where vmware helpers are installed
-    # call the distrospecific fillup
-    # should use the abstract write runlevel script way, see
-    # http://lab.openslx.org/repositories/revision/openslx/2405 ff.
-    my $runlevelScript = $self->{distro}->fillRunlevelScript($location, $kind);
+    my $initfile = newInitFile();
+
+    my $script = "";
+    my $modpath = "";
+    my $modlist = "";
+    # vmpath is to be redefined here ...
+    if ($kind =~ /local*/) {
+        $vmpath = "";
+        $modpath = "/lib/modules/\$(uname -r)/misc";
+    } elsif ($kind =~ /vmpl*/) {
+        $vmpath = "/opt/openslx/plugin-repo/vmware/${kind}";
+        $modpath = "${vmpath}/vmroot/modules";
+    }
 
-    spitFile($file, $runlevelScript);
+    $initfile->setName("vmware-slx");
+    $initfile->setDesc("Setup environment for VMware Workstation or Player ($kind).");
+
+    # functions ...
+    $modlist = "vmnet vmmon";
+    $script = unshiftHereDoc(<<"    End-of-Here");
+        # VMplayer common stuff
+        insmod ${modpath}/vmmon.ko || return 1
+        insmod ${modpath}/vmnet.ko || return 1
+    End-of-Here
+    if ($kind eq 'local30' || $kind eq 'vmpl3.0') {
+        $script .= unshiftHereDoc(<<"        End-of-Here");
+            # VMplayer 3.0 specific stuff
+            insmod ${modpath}/vmci.ko
+            insmod ${modpath}/vmblock.ko
+            insmod ${modpath}/vsock.ko
+        End-of-Here
+        $modlist .= "vsock vmci vmblock";
+    } elsif ($kind eq 'local20' || $kind eq 'local25' || $kind eq 'vmpl2.0' || $kind eq 'vmpl2.5') {
+        $script .= unshiftHereDoc(<<"        End-of-Here");
+            # VMplayer 2.X specific stuff
+            insmod ${modpath}/vmblock.ko
+        End-of-Here
+        $modlist .= "vmblock";
+    }
+    $initfile->addFunction(
+        "load_modules",
+        "$script"
+    );
+    $initfile->addFunction(
+        "unload_modules",
+        "rmmod $modlist 2>/dev/null"
+    );
+    # vmnet0,1,8 (bridge, nat, host-only) interface definition
+    $script = unshiftHereDoc(<<"        End-of-Here");
+        # let point the path directly to the directory where the binary lives
+        location="$vmpath/usr/bin"
+        if [ -n "\$vmnet0" ] ; then
+            # the path might be directly point to the plugin dir
+        End-of-Here
+    if ($kind eq 'vmpl1.0' || $kind eq 'vmpl2.0' || $kind eq 'local10' || $kind eq 'local20') {
+        $script .= "    \$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n";
+    } else {
+        $script .= "    \$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0\n";
+    }
+    $script .= unshiftHereDoc(<<"        End-of-Here");
+        fi
+        if [ -n "\$vmnet1" ] ; then
+          \$location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet1.pid \\
+            /dev/vmnet1 vmnet1
+          ip addr add \$vmnet1 dev vmnet1
+          ip link set vmnet1 up
+          if [ -n "\$vmnet1nat" ] ; then
+            echo "1" >/proc/sys/net/ipv4/conf/vmnet1/forwarding 2>/dev/null
+            echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null
+            #iptables -A -s vmnet1 -d br0
+          fi
+          /opt/openslx/uclib-rootfs/usr/sbin/udhcpd \\
+            -S /etc/vmware/udhcpd/udhcpd-vmnet1.conf
+        fi
+        if [ -n "\$vmnet8" ] ; then
+          \$location/vmnet-netifup -d /var/run/vmnet-netifup-vmnet8.pid \\
+              /dev/vmnet8 vmnet8
+          ip addr add \$vmnet8 dev vmnet8
+          ip link set vmnet8 up
+          echo "1" >/proc/sys/net/ipv4/conf/vmnet8/forwarding 2>/dev/null
+          echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null
+          iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE
+          /opt/openslx/uclib-rootfs/usr/sbin/udhcpd \\
+            -S /etc/vmware/udhcpd/udhcpd-vmnet8.conf
+        fi
+        End-of-Here
+    $initfile->addFunction(
+        "vmnetif",
+        "$script"
+    );
+    $script = unshiftHereDoc(<<"        End-of-Here");
+        # include default directories
+        . /etc/opt/openslx/openslx.conf
+        # load the configuration file
+        . \${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf
+        # hack to access the first serial/parallel port
+        chmod a+rw /dev/ttyS0
+        chmod a+rw /dev/parport0
+        load_modules
+        vmnetif
+        End-of-Here
+    $initfile->addToCase(
+        "start",
+        "$script"
+    );
+    $script = unshiftHereDoc(<<"        End-of-Here");
+        killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \\
+          vmware-tray vmnet-dhcpd 2>/dev/null
+        # might take a while until all services are shut down
+        sleep 1
+        unload_modules
+        End-of-Here
+    $initfile->addToCase(
+        "stop",
+        "$script"
+    );
+    $initfile->addToCase(
+        "status",
+        "vmstatus"
+    );
+    $initfile->addToCase(
+        "restart",
+        "\$0 stop && \$0 start"
+    );
+        
+    my $distro = (split('-',$self->{'os-plugin-engine'}->distroName()))[0];
+    my $runlevelscript = getInitFileForDistro($initfile, $distro);
+    # todo: because we dont have distribution or version dependend
+    #       init scripts we could put it directly into /etc/init.d...
+    spitFile("$self->{'pluginRepositoryPath'}/vmware-slx", $runlevelscript);
 }
 
 
@@ -523,12 +651,6 @@ sub _localInstallation
     my $vmversion = "";
     my $vmbuildversion = "";
 
-    my $pluginFilesPath 
-        = "$self->{'openslxBasePath'}/lib/plugins/$self->{'name'}/files";
-    my $installationPath = "$self->{'pluginRepositoryPath'}/$kind";
-
-    mkpath($installationPath);
-
     # if vmware ws is installed, vmplayer is installed, too.
     # we will only use vmplayer
     if (-e "/usr/lib/vmware/bin/vmplayer") {
@@ -538,37 +660,43 @@ sub _localInstallation
         $vmversion = $versionhash{vmversion};
         $vmbuildversion = $versionhash{vmbuildversion};
 
-        ## Copy needed files
-        my @files = qw(nvram);
-        foreach my $file (@files) {
-            copyFile("$pluginFilesPath/$file", "$installationPath");
+        # set version information
+        # VMplayer 2.0
+        if ($vmversion eq "2.0" || $vmversion eq "6.0") {
+            $kind="local20";
+        # VMplayer 2.5
+        } elsif ($vmversion eq "2.5" || $vmversion eq "6.5") {
+            $kind="local25";
+        # VMplayer 3.0, Workstation 7.0
+        } elsif ($vmversion eq "3.0" || $vmversion eq "7.0") {
+            $kind="local30";
         }
+        # Create runlevel script depending on detected version
+        $self->_writeRunlevelScript("$vmpath", "$kind");
 
-        # Create runlevel script -> to be fixed!!
-        my $runlevelScript = "$self->{'pluginRepositoryPath'}/$kind/vmware.init";
-        if ($vmversion eq "2.5") {
-            $self->_writeRunlevelScript($vmbin, $runlevelScript, "local25");
-        } elsif ($vmversion eq "3.0") {
-            $self->_writeRunlevelScript($vmbin, $runlevelScript, "local30");
-        } else {
-            $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind);
+        # Create wrapper scripts, kind of localNN is set to local
+        if ( $kind =~ /local*/ ) { $kind = "local"; }
+        if (-e "/usr/lib/vmware/bin/vmware") {
+            $self->_writeWrapperScript("$vmpath", "$kind", "ws");
+        }
+        if (-e "/usr/lib/vmware/bin/vmplayer") {
+            $self->_writeWrapperScript("$vmpath", "$kind", "player");
         }
 
-        # Create wrapper scripts
-        if (-e "/usr/bin/vmware") {
-            $self->_writeWrapperScript("$vmpath", "$kind", "ws")
-        } else {
-            $self->_writeWrapperScript("$vmpath", "$kind", "player")
+        # copy nvram file
+        my $pluginFilesPath 
+            = "$self->{'openslxBasePath'}/lib/plugins/$self->{'name'}/files";
+        my @files = qw(nvram);
+        foreach my $file (@files) {
+            copyFile("$pluginFilesPath/$file", "$self->{'pluginRepositoryPath'}/$kind");
         }
         
-    }
-    # else { TODO: errorhandling }
-    
-    ## Creating needed config /etc/vmware/config
+    } # else { TODO: errorhandling if file or string doesn't exist }
+
+    ## creating needed config /etc/vmware/config
     $self->_writeVmwareConfigs("$kind", "$vmpath");
 }
 
-
 sub _vmpl2Installation {
     my $self     = shift;
 
@@ -595,8 +723,7 @@ sub _vmpl2Installation {
     system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/$kind/install-vmpl.sh $kind");
 
     # Create runlevel script
-    my $runlevelScript = "$self->{'pluginRepositoryPath'}/$kind/vmware.init";
-    $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind);
+    $self->_writeRunlevelScript($vmpath, $kind);
 
     # Create wrapperscripts
     $self->_writeWrapperScript("$vmpath", "$kind", "player");
@@ -631,8 +758,7 @@ sub _vmpl25Installation {
     system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/$kind/install-vmpl.sh $kind");
 
     # Create runlevel script
-    my $runlevelScript = "$self->{'pluginRepositoryPath'}/$kind/vmware.init";
-    $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind);
+    $self->_writeRunlevelScript($vmpath, $kind);
 
     # Create wrapperscripts
     $self->_writeWrapperScript("$vmpath", "$kind", "player");
@@ -667,8 +793,7 @@ sub _vmpl1Installation {
     system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/$kind/install-vmpl.sh $kind");
 
     # Create runlevel script
-    my $runlevelScript = "$self->{'pluginRepositoryPath'}/$kind/vmware.init";
-    $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind);
+    $self->_writeRunlevelScript($vmpath, $kind);
 
     # create wrapper scripts
     $self->_writeWrapperScript("$vmpath", "$kind", "player");