summaryrefslogtreecommitdiffstats
path: root/core/modules/run-virt/data/opt
diff options
context:
space:
mode:
authorSimon Rettberg2020-08-26 15:05:12 +0200
committerSimon Rettberg2020-08-26 15:05:12 +0200
commit9b0f9c86ac8ca6ab0090f145ef69346c090d6005 (patch)
tree8cc8c7bf244c0330b82d70f00a6dbda39c702278 /core/modules/run-virt/data/opt
parent[run-virt] Determine screen count before we start WM (diff)
downloadmltk-9b0f9c86ac8ca6ab0090f145ef69346c090d6005.tar.gz
mltk-9b0f9c86ac8ca6ab0090f145ef69346c090d6005.tar.xz
mltk-9b0f9c86ac8ca6ab0090f145ef69346c090d6005.zip
[run-virt] Fix load order of includes
Diffstat (limited to 'core/modules/run-virt/data/opt')
-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 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")