summaryrefslogtreecommitdiffstats
path: root/core/modules/vmchooser2
diff options
context:
space:
mode:
authorSimon Rettberg2018-01-19 12:57:44 +0100
committerSimon Rettberg2018-01-19 12:58:17 +0100
commita4dcf2f1cf51b2c920b007885e1a0da94ef41170 (patch)
tree536a1e9c8ee65b5827451a95e694e018eb3fb235 /core/modules/vmchooser2
parentFix UID/USER ambiguity in several places (diff)
downloadmltk-a4dcf2f1cf51b2c920b007885e1a0da94ef41170.tar.gz
mltk-a4dcf2f1cf51b2c920b007885e1a0da94ef41170.tar.xz
mltk-a4dcf2f1cf51b2c920b007885e1a0da94ef41170.zip
[vmchooser2] Default PVS to on if hybrid mode is enabled
References #3290
Diffstat (limited to 'core/modules/vmchooser2')
-rwxr-xr-xcore/modules/vmchooser2/data/opt/openslx/bin/vmchooser2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser
index 39563322..b06443ae 100755
--- a/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser
+++ b/core/modules/vmchooser2/data/opt/openslx/bin/vmchooser
@@ -45,7 +45,7 @@ elif [ -n "$SLX_AUTOSTART_UUID" ]; then
fi
if [ -z "$SLX_NO_PVS" ]; then
EXTRA="$EXTRA --pvs"
- if [ "x$SLX_PVS_DEFAULT" = "xON" ]; then
+ if [ "x$SLX_PVS_DEFAULT" = "xON" ] || [ "x$SLX_PVS_HYBRID" = "xyes" ]; then
EXTRA="$EXTRA --pvs-checked"
fi
fi