summaryrefslogtreecommitdiffstats
path: root/core/modules/run-virt/data/opt/openslx/vmchooser
diff options
context:
space:
mode:
authorSimon Rettberg2019-04-08 15:21:58 +0200
committerSimon Rettberg2019-04-08 15:21:58 +0200
commitede26d9d62406d265c7d54120bd78ec1d6b00144 (patch)
tree92c1ad904dee937b6375364971ed9b4f576d5e6d /core/modules/run-virt/data/opt/openslx/vmchooser
parent[rootfs-stage32] Fix detecting single digit type MBR partitions (diff)
downloadmltk-ede26d9d62406d265c7d54120bd78ec1d6b00144.tar.gz
mltk-ede26d9d62406d265c7d54120bd78ec1d6b00144.tar.xz
mltk-ede26d9d62406d265c7d54120bd78ec1d6b00144.zip
[run-virt/pam-slx-plug] Honor SHARE_NO_HOME_WARN
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser')
-rwxr-xr-xcore/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exebin58368 -> 58368 bytes
-rw-r--r--core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc7
2 files changed, 7 insertions, 0 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe b/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
index 76703d53..54cedabb 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
Binary files differ
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
index d2685c15..e302bdd7 100644
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
@@ -107,6 +107,12 @@ setup_virtual_floppy() {
local UNAME=
[ -s "${HOME}/.openslx/account" ] && UNAME=$(cat "${HOME}/.openslx/account")
notempty UNAME || UNAME=$(whoami)
+
+ # Only warn for non-demo
+ if [ "$SHARE_NO_HOME_WARN" = "2" ] && [ "$UNAME" != "demo" ]; then
+ SHARE_NO_HOME_WARN=0
+ fi
+
cat > "${TMPDIR}/openslx.ini" <<-EOF
[openslx]
username=${UNAME}
@@ -119,6 +125,7 @@ setup_virtual_floppy() {
passCreds=${SHARE_CREDENTIAL_PASSTHROUGH}
bootIp=${SLX_PXE_CLIENT_IP}
muteSound=${MUTED}
+ noHomeWarn=${SHARE_NO_HOME_WARN}
[remap]
documents=${SHARE_DOCUMENTS}