* made names of distro module consistent across OpenSLX - now the always start with

  a capital letter followed by all lowercase (Debian, Fedora, Gentoo, Suse, Ubuntu)
* refactored loading of distro modules into a separate function (loadDistroModule() 
  in Basics.pm)
* finished support to logging to a file in syslog plugin
* worked at desktop plugin (still not working, though)

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

1 files changed, 142 insertions, 0 deletions

diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
new file mode 100644
index 00000000..e8f40c16
--- /dev/null
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
@@ -0,0 +1,142 @@
+# Copyright (c) 2008 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# vmware/OpenSLX/Distro/debian.pm
+#    - provides Debian-specific overrides of the Distro API for the vmware 
+#      plugin.
+# -----------------------------------------------------------------------------
+package vmware::OpenSLX::Distro::Debian;
+
+use strict;
+use warnings;
+
+use base qw(vmware::OpenSLX::Distro::Base);
+
+use OpenSLX::Basics;
+use OpenSLX::Utils;
+
+################################################################################
+### interface methods
+################################################################################
+
+sub fillRunlevelScript
+{
+    my $self     = shift;
+    my $location = shift;
+
+    my $script = unshiftHereDoc(<<"    End-of-Here");
+        #! /bin/sh
+        # Ubuntu specific 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() {
+          # to be filled in via the stage1 configuration script
+          modprobe -qa vmmon vmnet vmblock 2>/dev/null || echo "Problem here!"
+          # most probably nobody wants to run the parallel port driver ...
+          #modprobe vm...
+        }
+        unload_modules() {
+          # to be filled with the proper list within via the stage1 configuration
+          # script
+          rmmod vmmon vmblock vmnet 2>/dev/null
+        }
+        # the bridged interface
+        setup_vmnet0() {
+          if [ -n "\$vmnet0" ] ; then
+            # the path might be directly point to the plugin dir
+            $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0
+          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
+            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
+          fi
+        }
+        # incomplete ...
+        setup_vmnet8() {
+          if [ -n "\$vmnet8" ] ; then
+            test -c /dev/vmnet1 || mknod c 119 8 /dev/vmnet8
+            # /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
+            dhcpif="\$dhcpif vmnet8"
+            ip addr add \$vmnet8 dev vmnet8
+          fi
+        }
+        runvmdhcpd() {
+          if [ -n "\$dhcpif" ] ; then
+            # the path might be directly point to the plugin dir
+            mkdir /var/run/vmware 2>/dev/null
+            $location/vmnet-dhcpd -cf /etc/vmware/dhcpd.conf -lf \\
+              /var/run/vmware/dhcpd.leases -pf /var/run/vmnet-dhcpd-vmnet8.pid \$dhcpif
+          fi
+        }
+        # initialize the lsb status messages
+        . /lib/lsb/init-functions
+
+        case \$1 in
+          start)
+            log_daemon_msg "Starting vmware background services ..." "vmware"
+            # load the configuration file
+            . /etc/vmware/slxvmconfig
+            load_modules || log_warning_msg "The loading of vmware modules failed"
+            setup_vmnet0 || log_warning_msg "Problems setting up vmnet0 interface"
+            setup_vmnet1 || log_warning_msg "Problems setting up vmnet1 interface"
+            setup_vmnet8 || log_warning_msg "Problems setting up vmnet8 interface"
+            runvmdhcpd
+            log_end_msg $?
+          ;;
+          stop)
+            # message output should match the given vendor-os
+            log_daemon_msg "Stopping vmware background services ..." "vmware"
+            killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \\
+              vmware-tray 2>/dev/null
+            # wait for shutting down of interfaces
+            usleep 50000
+            unload_modules
+            log_end_msg $?
+          ;;
+          status)
+            log_daemon_msg "Say something useful here ..."
+          ;;
+        esac
+        exit 0
+    End-of-Here
+    return $script;
+}
+
+1;
\ No newline at end of file