From 19c74d4a56c353556c6f6b4f62e642c2bafc24e1 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 25 Jun 2019 16:38:25 +0200
Subject: [run-virt] Linux scripts +adminrun

---
 .../opt/openslx/vmchooser/data/linux/includes/00_vars.inc     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/00_vars.inc')

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 5b69d90c..93f0d3db 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
@@ -1,5 +1,11 @@
 ### Variablen #####################################
 
+DISKMOUNTDIR=/mnt/diskmount
+ADMINRUNDIR="$DISKMOUNTDIR"/adminrun
+SLXCONFIGFILE="$DISKMOUNTDIR"/openslx.ini
+CONFIGFILE="$DISKMOUNTDIR"/shares.dat
+LOGINUSER=$(grep '^username=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
+
 ##### User related#################
 LOCALUSER=student
 USERHOME=/home/"$LOCALUSER"
@@ -10,9 +16,6 @@ USERLOGFILE="$USERDESKTOP"/openslx.log
 
 
 ##### Mounting, network, PW #######
-DISKMOUNTDIR=/mnt/diskmount
-SLXCONFIGFILE="$DISKMOUNTDIR"/openslx.ini
-CONFIGFILE="$DISKMOUNTDIR"/shares.dat
 KEYTEMP=$(mktemp -t XXXXXXXXXX.dat)
 RAWKEYTEMP=$(mktemp -t XXXXXXXXXX.dat)
 BYTES=256
@@ -41,7 +44,7 @@ GLOBALUSER=$(echo "$GLOBALDOMAINUSER" | cut -d '\' -f 2)
 REMAPMODE=$(grep '^remapMode=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
 CREATEMISSING=$(grep '^createMissingRemap=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
 
-##### Script (Autostart ) #########
+##### Script (Autostart & admin) #########
 SCRIPTUSER=$(grep '^scriptUser=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
 SCRIPTVISIBILITY=$(grep '^scriptVisibility=' "$SLXCONFIGFILE" | cut -d '=' -f 2)
 SCRIPTEXT=$(grep scriptExt "$DISKMOUNTDIR/openslx.ini" | cut -f 2 -d "=")
-- 
cgit v1.2.3-55-g7522