diff options
| author | Volker Uhrig | 2008-10-13 14:01:49 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-10-13 14:01:49 +0200 |
| commit | e18714e819d6fee6d6428ce70ddbffc303415208 (patch) | |
| tree | c9a037769390b67358c538f62967cce16389de65 /os-plugins/plugins/vmware/OpenSLX/Distro | |
| parent | * got vmplayer running without their installer and like on our vmware system (diff) | |
| download | core-e18714e819d6fee6d6428ce70ddbffc303415208.tar.gz core-e18714e819d6fee6d6428ce70ddbffc303415208.tar.xz core-e18714e819d6fee6d6428ce70ddbffc303415208.zip | |
* added missing identification of local installed vmplayer
including different init script
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2287 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/vmware/OpenSLX/Distro')
4 files changed, 8 insertions, 8 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm index 04c72ca4..c64c804c 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm @@ -69,7 +69,7 @@ sub fillRunlevelScript End-of-Here # Load modules - if ($kind eq 'local') { + 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 @@ -131,7 +131,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5') { + if ($kind eq 'vmpl2.5' || $kind eq 'local25') { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0"; } else { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0"; diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm index 54047aca..1e3c8910 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm @@ -56,7 +56,7 @@ sub fillRunlevelScript End-of-Here # Load modules - if ($kind eq 'local') { + 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 @@ -116,7 +116,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5') { + if ($kind eq 'vmpl2.5' || $kind eq 'local25') { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0"; } else { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0"; diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm index ea734467..2612fafd 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm @@ -52,7 +52,7 @@ sub fillRunlevelScript End-of-Here # load modules - if ($kind eq 'local') { + 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 @@ -114,7 +114,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5') { + if ($kind eq 'vmpl2.5' || $kind eq 'local25') { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0"; } else { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0"; diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm index e9b8f121..2cbf7674 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm @@ -57,7 +57,7 @@ sub fillRunlevelScript End-of-Here # Load modules - if ($kind eq 'local') { + 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 @@ -117,7 +117,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5') { + if ($kind eq 'vmpl2.5'||$kind eq 'local25') { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0"; } else { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0"; |