[qemu] Rename 'qemukvm' occurrences in the core module to 'qemu'

17 files changed, 40 insertions, 53 deletions

diff --git a/core/modules/qemu/data/addon-init b/core/modules/qemu/data/addon-init
index cccc1e8a..c7c96ae4 100755
--- a/core/modules/qemu/data/addon-init
+++ b/core/modules/qemu/data/addon-init
@@ -1,8 +1,4 @@
 #!/bin/ash
 
 systemctl daemon-reload
-systemctl start qemukvm.service
-
-# this seems to be necessary due to the misbehaviour of udevd
-# in view of the undetected ENV dev_type 
-systemctl restart systemd-udevd
+systemctl start qemu.service
diff --git a/core/modules/qemu/data/etc/qemu/bridge.conf b/core/modules/qemu/data/etc/qemu/bridge.conf
deleted file mode 100644
index b8478434..00000000
--- a/core/modules/qemu/data/etc/qemu/bridge.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# These needs to be compatible with the
-# bridge's names generated by
-# /opt/openslx/scripts/systemd-run_virt_env
-allow br0
-allow nat1
-allow vsw2
diff --git a/core/modules/qemu/data/etc/systemd/system/qemukvm.service b/core/modules/qemu/data/etc/systemd/system/qemu.service
index f1f3dec6..914e956c 100644
--- a/core/modules/qemu/data/etc/systemd/system/qemukvm.service
+++ b/core/modules/qemu/data/etc/systemd/system/qemu.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=Sets up the virtual box environment
+Description=Sets up the QEMU hypervisor
 Requires=run-virt-env.service
 After=run-virt-env.service
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/opt/openslx/scripts/systemd-qemukvm_env start
+ExecStart=/opt/openslx/scripts/systemd-qemu_env start
diff --git a/core/modules/qemu/data/opt/openslx/scripts/systemd-qemukvm_env b/core/modules/qemu/data/opt/openslx/scripts/systemd-qemu_env
index 631c159f..c8343cd5 100755
--- a/core/modules/qemu/data/opt/openslx/scripts/systemd-qemukvm_env
+++ b/core/modules/qemu/data/opt/openslx/scripts/systemd-qemu_env
@@ -1,7 +1,7 @@
-#!/bin/ash
+#!/bin/bash
 # -----------------------------------------------------------------------------
 #
-# Copyright (c) 2017..2018 bwLehrpool-Projektteam
+# Copyright (c) 2017..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,8 +12,8 @@
 # General information about bwLehrpool can be found at https://bwlehrpool.de
 #
 # -----------------------------------------------------------------------------
-# systemd-qemukvm_env
-#    - This is the preparation script for the configuration of Linux Qemu/KVM.
+# systemd-qemu_env
+#    - This is the preparation script for the configuration of QEMU on Linux.
 ################################################################################
 
 # lazy load all kvm related modules
@@ -22,7 +22,6 @@ modprobe kvm_amd
 modprobe kvm_intel
 
 if [ ! -e /dev/kvm ]; then
-	slxlog "qemukvm-modules" "/dev/kvm not found! Missing kvm kernel module(s)?"
+	slxlog "qemu-modules" "/dev/kvm not found! Missing kvm kernel module(s)?"
 	exit 1
 fi
-
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)
diff --git a/core/modules/qemu/module.conf b/core/modules/qemu/module.conf
index 0cf394cf..61069809 100644
--- a/core/modules/qemu/module.conf
+++ b/core/modules/qemu/module.conf
@@ -1,5 +1,2 @@
 #!/bin/bash
-REQUIRED_MODULES=""
-REQUIRED_DIRECTORIES="
-		/
-"
+REQUIRED_MODULES="libvirt"
diff --git a/core/modules/qemu/module.conf.debian b/core/modules/qemu/module.conf.debian
index 4773a871..d4af965d 100644
--- a/core/modules/qemu/module.conf.debian
+++ b/core/modules/qemu/module.conf.debian
@@ -1,15 +1,16 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-		qemu
-		qemu-kvm
+	qemu
+	qemu-kvm
 "
 
 REQUIRED_CONTENT_PACKAGES="
-		qemu
-		qemu-kvm
-		qemu-system-common
-		qemu-system-x86
-		qemu-user
-		qemu-utils
-		seabios
+	qemu
+	qemu-kvm
+	qemu-system-common
+	qemu-system-arm
+	qemu-system-x86
+	qemu-utils
+	seabios
+	ovmf
 "
diff --git a/core/modules/qemu/module.conf.ubuntu b/core/modules/qemu/module.conf.ubuntu
index 4773a871..d4af965d 100644
--- a/core/modules/qemu/module.conf.ubuntu
+++ b/core/modules/qemu/module.conf.ubuntu
@@ -1,15 +1,16 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
-		qemu
-		qemu-kvm
+	qemu
+	qemu-kvm
 "
 
 REQUIRED_CONTENT_PACKAGES="
-		qemu
-		qemu-kvm
-		qemu-system-common
-		qemu-system-x86
-		qemu-user
-		qemu-utils
-		seabios
+	qemu
+	qemu-kvm
+	qemu-system-common
+	qemu-system-arm
+	qemu-system-x86
+	qemu-utils
+	seabios
+	ovmf
 "
diff --git a/core/targets/qemu/qemu b/core/targets/qemu/qemu
new file mode 120000
index 00000000..bb8ffc08
--- /dev/null
+++ b/core/targets/qemu/qemu
@@ -0,0 +1 @@
+../../modules/qemu
\ No newline at end of file
diff --git a/core/targets/qemukvm/qemukvm b/core/targets/qemukvm/qemukvm
deleted file mode 120000
index e8e7d1b3..00000000
--- a/core/targets/qemukvm/qemukvm
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/qemukvm
\ No newline at end of file