Xserver, qemukvm plugin stuff ...

1 files changed, 30 insertions, 10 deletions

diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 8cf1c7ab..eb0b835a 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -256,7 +256,6 @@ sub preInstallationPhase()
     }
 }
 
-
 sub installationPhase
 {
     my $self = shift;
@@ -433,25 +432,46 @@ sub _writeRunlevelScript
         "unload_modules",
         "rmmod $modlist 2>/dev/null"
     );
-    # vmnet interface definition
+    # 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
+        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
         if [ -n "\$vmnet1" ] ; then
-          # the path might be directly point to the plugin dir
-          location=$vmpath
           \$location/usr/bin/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
-            echo "1" > /proc/sys/net/ipv4/conf/vmnet1/forwarding 2>/dev/null
-            echo "1" > /proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null
+            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
-          \$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
+          /opt/openslx/uclib-rootfs/usr/sbin/udhcpd \\
+            -S /etc/vmware/udhcpd-vmnet1.conf/udhcpd.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
+          # /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
+          /opt/openslx/uclib-rootfs/usr/sbin/udhcpd \\
+            -S /etc/vmware/udhcpd-vmnet8.conf/udhcpd.conf
+          fi
+        }
         End-of-Here
     $initfile->addFunction(
         "vmnetif",
@@ -489,7 +509,7 @@ sub _writeRunlevelScript
     );
     $initfile->addToCase(
         'restart',
-        'stop && start'
+        '$0 stop && $0 start'
     );
         
     my $distro = (split('-',$self->{'os-plugin-engine'}->distroName()))[0];