diff options
| author | Jonathan Bauer | 2020-08-26 14:35:34 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2020-08-26 14:35:34 +0200 |
| commit | fc462e321a8f181cf27886e8e79c5e40953d754b (patch) | |
| tree | 867b8ae8d601b5773e7647ce70dedfc5e3268319 /core/modules/run-virt | |
| parent | Merge branch 'master' into installer (diff) | |
| parent | [run-virt] Determine screen count before we start WM (diff) | |
| download | mltk-fc462e321a8f181cf27886e8e79c5e40953d754b.tar.gz mltk-fc462e321a8f181cf27886e8e79c5e40953d754b.tar.xz mltk-fc462e321a8f181cf27886e8e79c5e40953d754b.zip | |
Merge branch 'master' into installer
Diffstat (limited to 'core/modules/run-virt')
| -rwxr-xr-x | core/modules/run-virt/data/opt/openslx/vmchooser/vmchooser-run_virt | 6 |
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") |