From 9b0f9c86ac8ca6ab0090f145ef69346c090d6005 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 26 Aug 2020 15:05:12 +0200
Subject: [run-virt] Fix load order of includes

---
 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 d0838c26..8dac549d 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,15 +105,15 @@ main() {
 	$(safesource --exit "${RUN_VIRT_INCLUDE_DIR}/init_core.inc")
 	writelog "#################### Initialization ####################"
 
+	# Read vmchooser.conf, (generated) virtualization.conf and slx config files
+	$(safesource --exit "${RUN_VIRT_INCLUDE_DIR}/load_configs.inc")
+
 	# 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")
 
-	# Read vmchooser.conf, (generated) virtualization.conf and slx config files
-	$(safesource --exit "${RUN_VIRT_INCLUDE_DIR}/load_configs.inc")
-
 	# Read needed variables from XML file
 	$(safesource --exit "${RUN_VIRT_INCLUDE_DIR}/get_xml_file_variables.inc")
 
-- 
cgit v1.2.3-55-g7522