diff options
| author | Volker Uhrig | 2008-07-05 20:58:59 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-07-05 20:58:59 +0200 |
| commit | 13e84ec837ebf22233391aee93546bc72094357a (patch) | |
| tree | 615c5d0ec296f0f64243f25d14c64bf35315210f /os-plugins/plugins/vmware/OpenSLX | |
| parent | * Minor fix, to make bug hunting easier (diff) | |
| download | core-13e84ec837ebf22233391aee93546bc72094357a.tar.gz core-13e84ec837ebf22233391aee93546bc72094357a.tar.xz core-13e84ec837ebf22233391aee93546bc72094357a.zip | |
* rewrite for vmpl1.0. tested on suse-10.2 with success
* asks now if a installed vmplX.0 player should be reinstalled
* writes now player version into /etc/vmware/version
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1904 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/vmware/OpenSLX')
5 files changed, 18 insertions, 5 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm index d453e106..fa9546ad 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm @@ -74,7 +74,9 @@ sub fillRunlevelScript # load module manuall vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/ module_src_path=\${vmware_kind_path}/vmroot/modules - insmod \${module_src_path}/vmblock.ko + if [ \${vmware_kind} != "vmpl1.0" ]; then + insmod \${module_src_path}/vmblock.ko + fi insmod \${module_src_path}/vmmon.ko insmod \${module_src_path}/vmnet.ko fi diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm index 90a5de85..88ba695e 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm @@ -61,7 +61,9 @@ sub fillRunlevelScript # load module manuall vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/ module_src_path=\${vmware_kind_path}/vmroot/modules - insmod \${module_src_path}/vmblock.ko + if [ \${vmware_kind} != "vmpl1.0" ]; then + insmod \${module_src_path}/vmblock.ko + fi insmod \${module_src_path}/vmmon.ko insmod \${module_src_path}/vmnet.ko fi diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm index f3ded970..5b865532 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm @@ -57,7 +57,9 @@ sub fillRunlevelScript # load module manuall vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/ module_src_path=\${vmware_kind_path}/vmroot/modules - insmod \${module_src_path}/vmblock.ko + if [ \${vmware_kind} != "vmpl1.0" ]; then + insmod \${module_src_path}/vmblock.ko + fi insmod \${module_src_path}/vmmon.ko insmod \${module_src_path}/vmnet.ko fi diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm index a6f2dc03..d758c002 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm @@ -62,7 +62,9 @@ sub fillRunlevelScript # load module manuall vmware_kind_path=/opt/openslx/plugin-repo/vmware/\${vmware_kind}/ module_src_path=\${vmware_kind_path}/vmroot/modules - insmod \${module_src_path}/vmblock.ko + if [ \${vmware_kind} != "vmpl1.0" ]; then + insmod \${module_src_path}/vmblock.ko + fi insmod \${module_src_path}/vmmon.ko insmod \${module_src_path}/vmnet.ko fi diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index 2903a083..a23bba8d 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -270,6 +270,11 @@ sub checkStage3AttrValues ); } + if ($vm_kind eq 'local' && + ! -d "/opt/openslx/plugin-repo/vmware/local") { + "local vmware installation not configured by slxos-plugin!" + } + if ($vm_kind eq 'vmpl2.0' && ! -d "/opt/openslx/plugin-repo/vmware/vmpl2.0/vmroot") { push @problems, _tr( @@ -280,7 +285,7 @@ sub checkStage3AttrValues if ($vm_kind eq 'vmpl1.0' && ! -d "/opt/openslx/plugin-repo/vmware/vmpl1.0/vmroot") { push @problems, _tr( - "No OpenSLX installation of VMware Player 2 found or installation failed. Using it as virtual machine wouldn't work!" + "No OpenSLX installation of VMware Player 1 found or installation failed. Using it as virtual machine wouldn't work!" ); } |