* fixed init scripts

* minor enhancement in stage3 which saves time


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

5 files changed, 10 insertions, 10 deletions

diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
index c64c804c..626d68aa 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
@@ -132,9 +132,9 @@ sub fillRunlevelScript
             # 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";
+      $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";
+      $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n";
     }
     $script .= unshiftHereDoc(<<"    End-of-Here");
           fi
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
index 1e3c8910..6dfa6a1a 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
@@ -117,9 +117,9 @@ sub fillRunlevelScript
             # 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";
+        $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";
+        $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n";
     }
     $script .= unshiftHereDoc(<<"    End-of-Here");
             exit 0
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
index 2612fafd..744a4127 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
@@ -115,9 +115,9 @@ sub fillRunlevelScript
             # 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";
+        $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";
+        $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n";
     }
     $script .= unshiftHereDoc(<<"    End-of-Here");
           fi
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
index 2cbf7674..8e006cb1 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
@@ -118,9 +118,9 @@ sub fillRunlevelScript
             # 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";
+        $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";
+        $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n";
     }
     $script .= unshiftHereDoc(<<"    End-of-Here");
             exit 0
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index 45f9396f..2c25a2d8 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -262,8 +262,8 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
     elif [ "${vmware_kind}" = "vmpl2.5" ]; then
       echo "vmplversion=2.5" > /mnt/etc/vmware/version
     elif [ "${vmware_kind}" = "local" ]; then
-      version=$(strings /mnt/usr/lib/vmware/bin/vmplayer|grep -e '^[12]\.[0-9]\.[0-9]'|head -n 1|cut -c 1-3)
-      echo "vmplversion=${version}" > /mnt/etc/vmware/version
+      . /mnt/opt/openslx/plugin-repo/vmware/local/versioninfo.txt
+      echo "vmplversion=${vmversion}" > /mnt/etc/vmware/version
     fi
 
     [ $DEBUGLEVEL -gt 0 ] && echo "done with 'vmware' os-plugin ..."