summaryrefslogtreecommitdiffstats
path: root/core/modules/run-virt/data/opt/openslx
diff options
context:
space:
mode:
authorSimon Rettberg2020-08-26 14:22:29 +0200
committerSimon Rettberg2020-08-26 14:22:29 +0200
commit0acc19945cc969089c4db812ab749926b29e4dda (patch)
tree710d68c25cf189ed010972c0196a431daef44eb6 /core/modules/run-virt/data/opt/openslx
parent[run-virt] Always use xfwm4 for multi-screen (not just vmware) (diff)
downloadmltk-0acc19945cc969089c4db812ab749926b29e4dda.tar.gz
mltk-0acc19945cc969089c4db812ab749926b29e4dda.tar.xz
mltk-0acc19945cc969089c4db812ab749926b29e4dda.zip
[run-virt] Determine screen count before we start WM
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx')
-rwxr-xr-xcore/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt6
1 files changed, 3 insertions, 3 deletions
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 cf4bc1ca..d0838c26 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
@@ -105,6 +105,9 @@ main() {
$(safesource --exit "${RUN_VIRT_INCLUDE_DIR}/init_core.inc")
writelog "#################### Initialization ####################"
+ # Declaration of hardware related variables
+ $(safesource --exit "${RUN_VIRT_INCLUDE_DIR}/set_runvirt_hardware_variables.inc")
+
# Window manager required early for user feedback through popups (e.g. errors) etc.
$(safesource "${RUN_VIRT_INCLUDE_DIR}/start_windowmanager.inc")
@@ -117,9 +120,6 @@ main() {
# Download metadata from server (e.g. vmx for vmware)
$(safesource --exit "${RUN_VIRT_INCLUDE_DIR}/download_vm_metadata.inc")
- # Declaration of hardware related variables
- $(safesource --exit "${RUN_VIRT_INCLUDE_DIR}/set_runvirt_hardware_variables.inc")
-
# Try to use dnbd3 to access the image, nfs/cifs fallback
$(safesource --exit "${RUN_VIRT_INCLUDE_DIR}/setup_image_access.inc")