diff options
| author | Simon Rettberg | 2016-10-10 19:37:42 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-10-10 19:37:42 +0200 |
| commit | 786df0669f73375d4bf5703c422e910839b7717f (patch) | |
| tree | a8a9340b5ffe652a401218eca37e417d2ac6827f /remote/modules/pvs2/data/opt/openslx/bin | |
| parent | [run-virt/udhcpc] Fix passing on domain suffix and search domains to VMs via ... (diff) | |
| download | tm-scripts-786df0669f73375d4bf5703c422e910839b7717f.tar.gz tm-scripts-786df0669f73375d4bf5703c422e910839b7717f.tar.xz tm-scripts-786df0669f73375d4bf5703c422e910839b7717f.zip | |
[pvs2] Use command line option for config file location; use new client side exam mode config
Diffstat (limited to 'remote/modules/pvs2/data/opt/openslx/bin')
| -rwxr-xr-x | remote/modules/pvs2/data/opt/openslx/bin/pvsstartup | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup b/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup index dc7bd48a..16a01708 100755 --- a/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup +++ b/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup @@ -4,15 +4,14 @@ timediff=5 counter=0 . /opt/openslx/config -if [ -n "$SLX_PVS_CONFIG_URL" ]; then - [ -z "$UID" ] && UID="$(id -u)" - [ -z "$HOME" ] && HOME="$(getent passwd "$UID" | head -n 1 | awk -F ':' '{print $6}')" - wget -O "$HOME/.config/openslx/pvs2/pvs2.ini" "$SLX_PVS_CONFIG_URL" +EXAM= +if [ -n "$SLX_EXAM" ]; then + EXAM="--exam-mode" fi while [ $timediff -gt 3 ]; do start="$(date +%s)" - pvsclient "$@" + pvsclient $EXAM "$@" ret=$? end="$(date +%s)" /opt/openslx/pvs2/kb-unlock.sh |