From f915f97f171e3106f7b5b31470878979963199e0 Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Wed, 24 Feb 2021 10:13:25 +0100
Subject: [run-virt] Use "domain=..." in mount-script

---
 .../run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc  | 1 +
 .../data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc      | 1 +
 2 files changed, 2 insertions(+)

(limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux')

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
-- 
cgit v1.2.3-55-g7522