diff options
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 39 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 2 |
2 files changed, 39 insertions, 2 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index aeecc068..768762f5 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -250,6 +250,45 @@ sub removalPhase return; } +sub checkStage3AttrValues +{ + my $self = shift; + my $stage3Attrs = shift; + my $vendorOSAttrs = shift; + my @problems; + + my $vm_kind = $stage3Attrs->{'vmware::kind'} || ''; + + + print "DEBUG $vm_kind\n"; + my $vmimg = $stage3Attrs->{'vmware::imgsrc'} || ''; + print "DEBUG $vmimg\n"; + + if ($vm_kind eq 'local' && ! -x "/usr/lib/vmware/bin/vmware") { + push @problems, _tr( + "No local executeable installation of vmware found! Using it as virtual machine wouldn't work!" + ); + } + + if ($vm_kind eq 'vmpl2.0' && + ! -d "/opt/openslx/plugin-repo/vmware/vmpl2.0/vmroot") { + push @problems, _tr( + "No OpenSLX installation of VMware Player 2 found or installation failed. Using it as virtual machine wouldn't work!" + ); + } + + 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!" + ); + } + + return if !@problems; + + return \@problems; +} + ####################################### ## local, non-general OpenSLX functions diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index 4b437810..8fd62baa 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -231,8 +231,6 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \ echo -e "\tmount -t usbfs usbfs /proc/bus/usb 2>/dev/null" \ >>/mnt/etc/${D_INITDIR}/boot.slx - # TODO: perhaps we can a) kick out vmdir - # b) configure vmdir by plugin configuration ## Copy version depending files cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/runvmware \ |