summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Bentele2021-07-06 09:57:54 +0200
committerManuel Bentele2021-07-06 09:57:54 +0200
commit8ef029d599c058ab677f900ed233a67f12e06e77 (patch)
tree044b2c076410f9f368a34ca4994d498fa969be88
parentMerge branch 'master' into installer (diff)
parent[qemu] Rename vmchooser plugin to 'qemukvm' (diff)
downloadmltk-installer.tar.gz
mltk-installer.tar.xz
mltk-installer.zip
Merge branch 'master' into installerinstaller
-rw-r--r--core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include (renamed from core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/run-virt.include)0
-rw-r--r--core/modules/qemu/module.build2
-rw-r--r--core/modules/qemu/module.conf2
3 files changed, 2 insertions, 2 deletions
diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/run-virt.include b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include
index 04dca832..04dca832 100644
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/run-virt.include
+++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include
diff --git a/core/modules/qemu/module.build b/core/modules/qemu/module.build
index 2a7952e8..801d1d4b 100644
--- a/core/modules/qemu/module.build
+++ b/core/modules/qemu/module.build
@@ -15,7 +15,7 @@ build() {
# install qemu runvirt plugin
local build_artifact_filename="runvirt-plugin-qemu-1.0-SNAPSHOT-jar-with-dependencies.jar"
- local install_dir="${MODULE_BUILD_DIR}/opt/openslx/vmchooser/plugins/qemu"
+ local install_dir="${MODULE_BUILD_DIR}/opt/openslx/vmchooser/plugins/qemukvm"
local install_filename="runvirt-plugin-qemu.jar"
mkdir -p "${install_dir}"
cp "${build_dir}/target/${build_artifact_filename}" "${install_dir}/${install_filename}" || perror "Could not install runvirt-plugin-qemu!"
diff --git a/core/modules/qemu/module.conf b/core/modules/qemu/module.conf
index 1914cffe..542827c3 100644
--- a/core/modules/qemu/module.conf
+++ b/core/modules/qemu/module.conf
@@ -10,5 +10,5 @@ REQUIRED_LIBRARIES=""
REQUIRED_DIRECTORIES=""
REQUIRED_FILES="
- /opt/openslx/vmchooser/plugins/qemu/runvirt-plugin-qemu.jar
+ /opt/openslx/vmchooser/plugins/qemukvm/runvirt-plugin-qemu.jar
"