From ce17bd2af66a227aab35518a072e49541107a8bf Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Fri, 17 Oct 2008 15:36:10 +0000
Subject: changed nat config: now the last octet of the ip confiw lill be
 omitted. the vmnet dev gets the ip prefix.1 the configs get prefix.2 this way
 nat seems to work. is this needed for host config as well?

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2358 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm |  6 +++---
 os-plugins/plugins/vmware/XX_vmware.sh               | 13 +++++++++----
 os-plugins/plugins/vmware/files/runvmware-player-v2  |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'os-plugins')

diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 31c6c24f..5d85d684 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -116,12 +116,12 @@ sub getAttrInfo
             applies_to_systems => 1,
             applies_to_clients => 1,
             description => unshiftHereDoc(<<'            End-of-Here'),
-                Format ServerIP/Netprefix
+                Format ServerIP/Netprefix. Last octet will be omitted
             End-of-Here
             #TODO: check if the input is valid
             #content_regex => qr{^(0|1)$},
-            content_descr => 'Allowed value: IP/Prefix',
-            default => '192.168.102.1/24',
+            content_descr => 'Allowed value: IP/Prefix. Last octet will be omitted',
+            default => '192.168.102.x/24',
         },
         # attribute 'kind' defines which set of VMware binaries should be 
         # activated ('local' provided with the main installation set).
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index f413f829..2e714cda 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -81,6 +81,7 @@ $(ipcalc -m $vmnet1|sed s/.*=//) {" \
         >> /mnt/etc/vmware/dhcpd-vmnet1.conf 
       echo -e "\toption broadcast-address $(ipcalc -b $vmnet1|sed s/.*=//);" \
         >> /mnt/etc/vmware/dhcpd-vmnet1.conf 
+      # Maybe a different ip is needed s. nat: vmnet="${vmsub}.2"
       echo -e "\toption routers $vmip;" \
         >> /mnt/etc/vmware/dhcpd-vmnet1.conf
       echo -e "}" \
@@ -91,9 +92,13 @@ $(ipcalc -m $vmnet1|sed s/.*=//) {" \
     # vmware nat interface configuration
     if [ -n "$vmware_vmnet8" ] ; then
       cp /mnt/etc/vmware/dhcpd-head.conf /mnt/etc/vmware/dhcpd-vmnet8.conf
-      local vmip=${vmware_vmnet8%/*}
+      local vmnet8ip=${vmware_vmnet8%/*}
       local vmpx=${vmware_vmnet8#*/}
-      local vmsub=$(echo $vmip |sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x">
+      local vmsub=$(echo $vmnet8ip |sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x">
+      # vmip is user for vmnet8 device
+      # vmnet is user for config files nat.conf/dhcp
+      local vmip="${vmsub}.1"
+      local vmnet="${vmsub}.2"
       echo -e "vmnet8=$vmip/$vmpx" >> /mnt/etc/vmware/slxvmconfig
       echo -e "\n# definition for virtual vmnet8 interface" \
         >> /mnt/etc/vmware/dhcpd-vmnet8.conf
@@ -104,7 +109,7 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
         >> /mnt/etc/vmware/dhcpd-vmnet8.conf
       echo -e "\toption broadcast-address $(ipcalc -b $vmip/$vmpx|sed s/.*=//);" \
         >> /mnt/etc/vmware/dhcpd-vmnet8.conf
-      echo -e "\toption routers $vmip;" \
+      echo -e "\toption routers $vmnet;" \
         >> /mnt/etc/vmware/dhcpd-vmnet8.conf
       echo -e "}" \
         >> /mnt/etc/vmware/dhcpd-vmnet8.conf
@@ -112,7 +117,7 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
         > /mnt/etc/vmware/nat.conf
       echo -e "[host]" \
         >> /mnt/etc/vmware/nat.conf
-      echo -e "ip = $vmip/$vmpx" \
+      echo -e "ip = $vmnet/$vmpx" \
         >> /mnt/etc/vmware/nat.conf
       echo -e "device = /dev/vmnet8" \
         >> /mnt/etc/vmware/nat.conf
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v2 b/os-plugins/plugins/vmware/files/runvmware-player-v2
index 7fb18630..0b3ddcf9 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v2
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v2
@@ -302,7 +302,7 @@ runvmwareconfheader ()
 
   ###### usb ###################################################################
   usb.present = \"TRUE\"
-  ehci.present= \"TRUE\"
+  ehci.present = \"TRUE\"
   usb.generic.autoconnect = \"TRUE\"
 
   ###### floppies ##############################################################
-- 
cgit v1.2.3-55-g7522