diff options
author | Simon Rettberg | 2024-05-15 16:21:50 +0200 |
---|---|---|
committer | Simon Rettberg | 2024-05-15 16:21:50 +0200 |
commit | f1ce8b4d202bf217e78c72d6292c0e234f3dfa7a (patch) | |
tree | bb1a867fd4464a1c85af2862492e66b1e0d1f5aa | |
parent | [vmware-common/run-virt] Fix is_on usage (diff) | |
download | mltk-f1ce8b4d202bf217e78c72d6292c0e234f3dfa7a.tar.gz mltk-f1ce8b4d202bf217e78c72d6292c0e234f3dfa7a.tar.xz mltk-f1ce8b4d202bf217e78c72d6292c0e234f3dfa7a.zip |
[run-virt] Read dnbd3-fuse status file
-rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc | 3 | ||||
-rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt | 2 |
2 files changed, 4 insertions, 1 deletions
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 abc0081f..61c98b78 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 @@ -119,6 +119,9 @@ setup_virtual_floppy() { local editmode=0 if is_on "$VMCHOOSER_ADMIN_MODE"; then editmode=1 + if [ -n "$DMSD_COW_SESSION" ]; then + resolution= + fi fi cat > "${FLOPPYDIR}/openslx.ini" <<-EOF diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt b/core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt index d817f5d6..f2fa4a89 100755 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt @@ -193,7 +193,7 @@ main() { cntr=0 while true; do writelog "Launching CoW-GUI" - cowgui --sessionid "$DMSD_COW_SESSION" --url "$cowurl" --pid "$DNBD3_PID" && break + cowgui --sessionid "$DMSD_COW_SESSION" --url "$cowurl" --pid "$DNBD3_PID" --status "$TMPDIR/cow/status" && break # Unclean exit, let's see if it's worth relaunching state="$( curl -m 3 -sS -L "$cowurl/status/$DMSD_COW_SESSION" | jq -r .state )" [ -z "$state" ] && break |