diff options
| author | Volker Uhrig | 2008-07-10 19:00:38 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-07-10 19:00:38 +0200 |
| commit | b6dce2ccb872702636ea81a4e69ea79de81b32a3 (patch) | |
| tree | 39bda3a111cb2fa64361a6d6915733f8456372df /os-plugins | |
| parent | * minor fix (diff) | |
| download | core-b6dce2ccb872702636ea81a4e69ea79de81b32a3.tar.gz core-b6dce2ccb872702636ea81a4e69ea79de81b32a3.tar.xz core-b6dce2ccb872702636ea81a4e69ea79de81b32a3.zip | |
* fixed vmbuild version check
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1918 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/vmware/files/runvmware-player-v1 | 8 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/files/runvmware-player-v2 | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v1 b/os-plugins/plugins/vmware/files/runvmware-player-v1 index e41dfcb5..ee170064 100644 --- a/os-plugins/plugins/vmware/files/runvmware-player-v1 +++ b/os-plugins/plugins/vmware/files/runvmware-player-v1 @@ -516,9 +516,11 @@ filecheck # VMPlayer Version. # strings is the fastest and most secure way, vmplayer -v takes too much time # and resources -vmbuild=$(strings /usr/lib/vmware/bin/vmplayer \ - | grep -m 1 "build-"|sed 's/.*build-//') -if [ ! -n ${vmbuild} ]; then +# TODO: find a solution which is faster... handeling different installed +# vmplversions +#vmbuild=$(strings /usr/lib/vmware/bin/vmplayer \ +# | grep -m 1 "build-"|sed 's/.*build-//') +if [ -z ${vmbuild} ]; then vmbuild=$(vmplayer -v | sed 's/.*build-//') fi diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v2 b/os-plugins/plugins/vmware/files/runvmware-player-v2 index e41dfcb5..b9391f05 100644 --- a/os-plugins/plugins/vmware/files/runvmware-player-v2 +++ b/os-plugins/plugins/vmware/files/runvmware-player-v2 @@ -516,9 +516,11 @@ filecheck # VMPlayer Version. # strings is the fastest and most secure way, vmplayer -v takes too much time # and resources -vmbuild=$(strings /usr/lib/vmware/bin/vmplayer \ - | grep -m 1 "build-"|sed 's/.*build-//') -if [ ! -n ${vmbuild} ]; then +# TODO: fine a faster solution with different installed vmplayer +# perhaps via stage1 + /etc/vmware/vmversion +#vmbuild=$(strings /usr/lib/vmware/bin/vmplayer \ +# | grep -m 1 "build-"|sed 's/.*build-//') +if [ -z ${vmbuild} ]; then vmbuild=$(vmplayer -v | sed 's/.*build-//') fi |