diff options
| author | Steffen Ritter | 2021-02-24 10:13:25 +0100 |
|---|---|---|
| committer | Steffen Ritter | 2021-02-24 10:13:25 +0100 |
| commit | f915f97f171e3106f7b5b31470878979963199e0 (patch) | |
| tree | 4294726c69740ead06b9cc9403afa15e3573f669 /core/modules/run-virt/data/opt/openslx/vmchooser/data/linux | |
| parent | [iptables-helper] Allways allow loopback (diff) | |
| download | mltk-f915f97f171e3106f7b5b31470878979963199e0.tar.gz mltk-f915f97f171e3106f7b5b31470878979963199e0.tar.xz mltk-f915f97f171e3106f7b5b31470878979963199e0.zip | |
[run-virt] Use "domain=..." in mount-script
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc | 1 | ||||
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc index 3cee7944..d6ddfbd0 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc @@ -39,6 +39,7 @@ NATADDR=$(head -n 1 "$CONFIGFILE" | cut -f 1 -d$'\t') PORT=$(head -n 1 "$CONFIGFILE" | cut -f 2 -d$'\t') SCHLUESSEL=$(head -n 1 "$CONFIGFILE" | cut -f 4 -d$'\t') GLOBALDOMAINUSER=$(head -n 1 "$CONFIGFILE" | cut -f 5 -d$'\t') +GLOBALDOMAIN=$(echo "$GLOBALDOMAINUSER" | cut -d '\' -f 1) GLOBALUSER=$(echo "$GLOBALDOMAINUSER" | cut -d '\' -f 2) ##### Remap ####################### diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc index 33ccf686..abeee359 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc @@ -127,6 +127,7 @@ function mount_home() export USER="${GLOBALUSER}" export PASSWD="${PW}" ERRORMSG="" + [ -n "$GLOBALDOMAIN" ] && MOUNTOPTS="${MOUNTOPTS},domain=$GLOBALDOMAIN" mounter "${MOUNTPARAM}" "${MOUNTOPTS}" "${SHAREPATH}" "${USERHOMEDIR}" 2>/dev/null 1>&2 ERR=$? unset USER |