diff options
| author | Volker Uhrig | 2008-10-16 13:45:50 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-10-16 13:45:50 +0200 |
| commit | 0de3831cbadfda424fc36472fa700badaa7ff3c4 (patch) | |
| tree | e4d054158697f5c81138bb8a3cafd0d00d8d6bf3 | |
| parent | * small fix (diff) | |
| download | core-0de3831cbadfda424fc36472fa700badaa7ff3c4.tar.gz core-0de3831cbadfda424fc36472fa700badaa7ff3c4.tar.xz core-0de3831cbadfda424fc36472fa700badaa7ff3c4.zip | |
* fixing start script
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2325 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm | 8 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm | 1 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm index e58ab4db..8f8d55f9 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm @@ -71,10 +71,10 @@ sub fillRunlevelScript # Load modules if ($kind eq 'local' || $kind eq 'local25') { $script .= unshiftHereDoc(<<" End-of-Here"); - # to be filled in via the stage1 configuration script - insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1 - insmod /lib/modules/\$(uname -r)/misc/vmnet.o || return 1 - insmod /lib/modules/\$(uname -r)/misc/vmblock.o 2>/dev/null || return 0 + # to be filled in via the stage1 configuration script + insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmnet.o || return 1 + insmod /lib/modules/\$(uname -r)/misc/vmblock.o 2>/dev/null || return 0 End-of-Here } elsif ($kind eq 'vmpl1.0') { $script .= unshiftHereDoc(<<" End-of-Here"); diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm index 6239c232..9064c048 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm @@ -115,7 +115,6 @@ sub fillRunlevelScript $script .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; } $script .= unshiftHereDoc(<<" End-of-Here"); - exit 0 fi } # we definately prefer the hostonly interface for NATed operation too diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm index b55d1960..ef890769 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm @@ -116,7 +116,6 @@ sub fillRunlevelScript $script .= " $location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0\n"; } $script .= unshiftHereDoc(<<" End-of-Here"); - exit 0 fi } # we definately prefer the hostonly interface for NATed operation too @@ -180,12 +179,13 @@ sub fillRunlevelScript echo -n "Stopping vmware background services ..." killall vmnet-netifup vmnet-natd vmnet-bridge vmware vmplayer \\ vmware-tray vmnet-dhcpd 2>/dev/null - # workaround, because we can kill more as we have started - rc_reset # wait for shutting down of interfaces. vmnet needs kinda # long sleep 1 unload_modules + # workaround, because we can kill and unload more as we have + # started + rc_reset rc_status -v ;; # we don't need a status yet... at least as long as it is |