summaryrefslogtreecommitdiffstats
path: root/core/modules/vmware12
diff options
context:
space:
mode:
authorSimon Rettberg2018-01-18 13:46:35 +0100
committerSimon Rettberg2018-01-18 13:46:35 +0100
commit01e008a9577155f6b0875b207e42f1c2bbd087f4 (patch)
treed505e3236867c6953e25b4ebd5a4f1b606c217a1 /core/modules/vmware12
parent[run-virt] add --sync to slxlog calls (diff)
downloadmltk-01e008a9577155f6b0875b207e42f1c2bbd087f4.tar.gz
mltk-01e008a9577155f6b0875b207e42f1c2bbd087f4.tar.xz
mltk-01e008a9577155f6b0875b207e42f1c2bbd087f4.zip
Fix UID/USER ambiguity in several places
Diffstat (limited to 'core/modules/vmware12')
-rw-r--r--core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc b/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
index 85fafc9f..d7ad77c6 100644
--- a/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
+++ b/core/modules/vmware12/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
@@ -27,7 +27,9 @@ declare -rg VM_CONF_DIR="/tmp/virt/vmware/${USER}.$$"
declare -rg VM_RUN_FILE="${VM_CONF_DIR}/run-vmware.conf"
# Users vmware config folder
-[ -z "${HOME}" ] && declare -rg HOME=$(getent passwd "$(whoami)" | awk -F ':' '{print $6}')
+[ -z "$UID" ] && UID=$(id -u)
+[ -z "${HOME}" ] && declare -rg HOME=$(getent passwd "$UID" | awk -F ':' '{print $6}')
+[ -z "${HOME}" ] && slxlog "run-virt-vmware-home" "Could not get home directory of user $(whoami) ($UID)"
declare -rg VM_HOME="${HOME}/.vmware"
# mltk generates a vmware config file with several version infos for vmware/player, read it