From 0de82592dddce2f734f30b6b7d92eff2ee289089 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 18 Nov 2019 16:29:19 +0100
Subject: [vmchooser2] Pre-select PVS if running on tutor machine

---
 core/modules/vmchooser2/data/opt/openslx/bin/vmchooser | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'core/modules/vmchooser2')

diff --git a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser
index f9b4ad3a..a07fa143 100755
--- a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser
+++ b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser
@@ -54,6 +54,10 @@ fi
 if [ -z "$SLX_NO_PVS" ]; then
 	EXTRA="$EXTRA --pvs"
 	if [ "x$SLX_PVS_DEFAULT" = "xON" ] || [ "x$SLX_PVS_HYBRID" = "xyes" ]; then
+		# Config option says checked by default, or this is hybrid manager
+		EXTRA="$EXTRA --pvs-checked"
+	elif grep -q -F -x -e "tutorIP=$SLX_PXE_CLIENT_IP" -e "tutorIP=$SLX_DHCP_CLIENT_IP" "/opt/openslx/pvs2/pvs2.ini"; then
+		# This IP is a tutor, also autoconnect
 		EXTRA="$EXTRA --pvs-checked"
 	fi
 fi
-- 
cgit v1.2.3-55-g7522