8 files changed, 10 insertions, 11 deletions
diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/determine_hardware_limitations.inc b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/determine_hardware_limitations.inc
index dd83b587..dd83b587 100644
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/determine_hardware_limitations.inc
+++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/determine_hardware_limitations.inc
diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/finalize_start_command.inc b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/finalize_start_command.inc
index 6d9df363..6d9df363 100644
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/finalize_start_command.inc
+++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/finalize_start_command.inc
diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/init_core.inc b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/init_core.inc
index fee2cd1c..fee2cd1c 100644
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/init_core.inc
+++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/init_core.inc
diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/log_config_summary.inc b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/log_config_summary.inc
index 6b4b279f..6b4b279f 100644
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/log_config_summary.inc
+++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/log_config_summary.inc
diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/setup_network.inc b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/setup_network.inc
index 73fb2518..73fb2518 100644
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/setup_network.inc
+++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/setup_network.inc
diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/setup_rw_layer.inc b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/setup_rw_layer.inc
index 32637e5d..32637e5d 100644
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/includes/setup_rw_layer.inc
+++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/includes/setup_rw_layer.inc
diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/run-virt.include
index 7d1149b0..9f2b1291 100644
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include
+++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/run-virt.include
@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 #
-# Copyright (c) 2009..2018 bwLehrpool-Projektteam
+# Copyright (c) 2009..2021 bwLehrpool-Projektteam
 #
 # This program/file is free software distributed under the GPL version 2.
 # See https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
@@ -12,12 +12,12 @@
 #
 # -----------------------------------------------------------------------------
 # run-virt.include
-#    - qemu/kvm plugin for vmchooser run-virt
+#    - qemu plugin for vmchooser run-virt
 ################################################################################
 
 # BASH_SOURCE[0] contains the file being sourced, namely this one
-declare -rg QEMUKVM_PLUGIN_DIR="$(dirname "${BASH_SOURCE[0]}")"
-declare -rg QEMUKVM_INCLUDE_DIR="${QEMUKVM_PLUGIN_DIR}/includes"
+declare -rg QEMU_PLUGIN_DIR="$(dirname "${BASH_SOURCE[0]}")"
+declare -rg QEMU_INCLUDE_DIR="${QEMU_PLUGIN_DIR}/includes"
 
 # TODO make this part of the metadata coming from the server
 # TBD: "firewall printer usb slxfloppy sound netshares"
@@ -25,20 +25,20 @@ declare -rg PLUGIN_FEATURES="slxfloppy"
 
 run_plugin() {
 	# declaration of default functions and variables for vmware
-	$(safesource --exit "${QEMUKVM_INCLUDE_DIR}/init_core.inc")
+	$(safesource --exit "${QEMU_INCLUDE_DIR}/init_core.inc")
 	
 	# determine limitations wrt RAM and CPU count of VM
-	$(safesource "${QEMUKVM_INCLUDE_DIR}/determine_hardware_limitations.inc")
+	$(safesource "${QEMU_INCLUDE_DIR}/determine_hardware_limitations.inc")
 
 	# setup networking
-	$(safesource "${QEMUKVM_INCLUDE_DIR}/setup_network.inc")
+	$(safesource "${QEMU_INCLUDE_DIR}/setup_network.inc")
 	
 	# setup rw layer for ro image
-	$(safesource "${QEMUKVM_INCLUDE_DIR}/setup_rw_layer.inc")
+	$(safesource "${QEMU_INCLUDE_DIR}/setup_rw_layer.inc")
 
 	# build the final start command
-	$(safesource "${QEMUKVM_INCLUDE_DIR}/finalize_start_command.inc")
+	$(safesource "${QEMU_INCLUDE_DIR}/finalize_start_command.inc")
 	
 	# print summary - needs writelog() from vmchooser-run_virt
-	$(safesource "${QEMUKVM_INCLUDE_DIR}/log_config_summary.inc")
+	$(safesource "${QEMU_INCLUDE_DIR}/log_config_summary.inc")
 }
diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/README b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/README
deleted file mode 100644
index 549d0037..00000000
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/README
+++ /dev/null
@@ -1 +0,0 @@
-Not tested since refactoring! (January 2017)