diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index 4f22a66a..16dfe520 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -334,7 +334,7 @@ sub _localInstallation # perhaps we need to recheck the following check. depending # on the installation it could differ and has multiple build- # strings - if ($data =~ m{(\d\.\d) build-(\d+)}) { + if ($data =~ m{[^\d\.](\d\.\d) build-(\d+)}) { $vmversion = $1; $vmbuildversion = $2; } diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index d753f64a..30f6fe0f 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -101,7 +101,7 @@ $(ipcalc -m $vmnet1|sed s/.*=//) {" \ if [ -n "$vmware_vmnet8" ] ; then local vmip=${vmware_vmnet8%/*} local vmpx=${vmware_vmnet8#*/} - uocal vmsub=$(echo $vmip |sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x"> + local vmsub=$(echo $vmip |sed 's,\(.*\)\..*,\1,') # x.x.x.x => x.x.x"> echo -e "vmnet8=$vmip/$vmpx" >> /mnt/etc/vmware/slxvmconfig echo -e "\n# definition for virtual vmnet8 interface" \ >> /mnt/etc/vmware/dhcpd.conf diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v1 b/os-plugins/plugins/vmware/files/runvmware-player-v1 index ec0ec652..d368e13d 100644 --- a/os-plugins/plugins/vmware/files/runvmware-player-v1 +++ b/os-plugins/plugins/vmware/files/runvmware-player-v1 @@ -537,7 +537,7 @@ sync # own nvram. We need it for floppy drive b, default nvram has just drive a # TODO: optimize, currently kinda inefficient, too much copys -cp /opt/openslx/plugin-repo/vmware */nvram.5.0 ${tmpdir}/nvram +cp /opt/openslx/plugin-repo/vmware/*/nvram.5.0 ${tmpdir}/nvram # adjust volume writelog "Unmuting sound...\c" diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v2 b/os-plugins/plugins/vmware/files/runvmware-player-v2 index ec0ec652..d368e13d 100644 --- a/os-plugins/plugins/vmware/files/runvmware-player-v2 +++ b/os-plugins/plugins/vmware/files/runvmware-player-v2 @@ -537,7 +537,7 @@ sync # own nvram. We need it for floppy drive b, default nvram has just drive a # TODO: optimize, currently kinda inefficient, too much copys -cp /opt/openslx/plugin-repo/vmware */nvram.5.0 ${tmpdir}/nvram +cp /opt/openslx/plugin-repo/vmware/*/nvram.5.0 ${tmpdir}/nvram # adjust volume writelog "Unmuting sound...\c" |