diff options
| author | Simon Rettberg | 2019-11-18 16:29:19 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-11-18 16:29:19 +0100 |
| commit | 0de82592dddce2f734f30b6b7d92eff2ee289089 (patch) | |
| tree | 6dde39ec0c72acddc96067a138746619edc692fc /core/modules/vmchooser2 | |
| parent | [xscreensaver/idleaction] Let xscreensaver manage standby again... (diff) | |
| download | mltk-0de82592dddce2f734f30b6b7d92eff2ee289089.tar.gz mltk-0de82592dddce2f734f30b6b7d92eff2ee289089.tar.xz mltk-0de82592dddce2f734f30b6b7d92eff2ee289089.zip | |
[vmchooser2] Pre-select PVS if running on tutor machine
Diffstat (limited to 'core/modules/vmchooser2')
| -rwxr-xr-x | core/modules/vmchooser2/data/opt/openslx/bin/vmchooser | 4 |
1 files changed, 4 insertions, 0 deletions
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 |