diff options
| author | Volker Uhrig | 2008-10-16 13:07:09 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-10-16 13:07:09 +0200 |
| commit | dda0eeeb7ff96ff17033157aa31dd86e7df27115 (patch) | |
| tree | 0b9150fbde0910581045db9468d9d997510d7fb3 /os-plugins/plugins/vmware/OpenSLX | |
| parent | Makefile wasn't altered matching to the changes in r2321. (diff) | |
| download | core-dda0eeeb7ff96ff17033157aa31dd86e7df27115.tar.gz core-dda0eeeb7ff96ff17033157aa31dd86e7df27115.tar.xz core-dda0eeeb7ff96ff17033157aa31dd86e7df27115.zip | |
* fixed some more ident for easier debugging
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2323 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/vmware/OpenSLX')
4 files changed, 12 insertions, 20 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm index 523bcd59..55a98210 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm @@ -125,18 +125,17 @@ 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\n"; + $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 .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; } - $script .= unshiftHereDoc(<<" End-of-Here"); + $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 diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm index 230fa309..c0b04336 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm @@ -110,11 +110,11 @@ 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\n"; + $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 .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; } - $script .= unshiftHereDoc(<<" End-of-Here"); + $script .= unshiftHereDoc(<<" End-of-Here"); exit 0 fi } @@ -122,9 +122,6 @@ sub fillRunlevelScript # distinction is made via enabled forwarding setup_vmnet1() { if [ -n "\$vmnet1" ] ; then - # we don't need the following test. It's handled by - # XX_vmware.sh - #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 diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm index a0c3564c..54a95be8 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm @@ -108,11 +108,11 @@ 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\n"; + $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 .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; } - $script .= unshiftHereDoc(<<" End-of-Here"); + $script .= unshiftHereDoc(<<" End-of-Here"); fi } # we definately prefer the hostonly interface for NATed operation too @@ -140,7 +140,6 @@ sub fillRunlevelScript # 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 diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm index 78542909..7d804c8f 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm @@ -111,11 +111,11 @@ 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\n"; + $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 .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; } - $script .= unshiftHereDoc(<<" End-of-Here"); + $script .= unshiftHereDoc(<<" End-of-Here"); exit 0 fi } @@ -123,9 +123,6 @@ sub fillRunlevelScript # distinction is made via enabled forwarding setup_vmnet1() { if [ -n "\$vmnet1" ] ; then - # we don't need the following test. It's handled by - # XX_vmware.sh - #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 |