From 0acc19945cc969089c4db812ab749926b29e4dda Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 26 Aug 2020 14:22:29 +0200
Subject: [run-virt] Determine screen count before we start WM

---
 core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/modules/run-virt')

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")
 
-- 
cgit v1.2.3-55-g7522