diff options
| author | Manuel Bentele | 2021-06-30 12:27:43 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2021-06-30 12:27:43 +0200 |
| commit | e0c7ae0a14a1a2e5b931ebde97d11f7ca936046d (patch) | |
| tree | 27b53836f12c315ab961eadbc7eba93528c69c34 | |
| parent | [qemu] Fix setting of cmdln options for the QEMU runvirt plugin (diff) | |
| download | mltk-e0c7ae0a14a1a2e5b931ebde97d11f7ca936046d.tar.gz mltk-e0c7ae0a14a1a2e5b931ebde97d11f7ca936046d.tar.xz mltk-e0c7ae0a14a1a2e5b931ebde97d11f7ca936046d.zip | |
[qemu] Change location of the runvirt Java plugin
| -rw-r--r-- | core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/run-virt.include | 2 | ||||
| -rw-r--r-- | core/modules/qemu/module.build | 2 | ||||
| -rw-r--r-- | core/modules/qemu/module.conf | 4 |
3 files changed, 6 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/qemu/run-virt.include index 99be4dac..d8aef1ae 100644 --- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/run-virt.include +++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemu/run-virt.include @@ -28,7 +28,7 @@ run_plugin() { # call the Libvirt Java tool to finalize configuration and start VM declare -rg VIRTCMD="java" - VIRTCMDOPTS=( "-jar" "/opt/openslx/share/java/runvirt-plugin-qemu.jar" ) + VIRTCMDOPTS=( "-jar" "/opt/openslx/vmchooser/plugins/qemu/runvirt-plugin-qemu.jar" ) notempty DEBUG && VIRTCMDOPTS+=( "-debug" "${DEBUG}" ) notempty VM_CLEANNAME && VIRTCMDOPTS+=( "-vmname" "${VM_CLEANNAME}" ) diff --git a/core/modules/qemu/module.build b/core/modules/qemu/module.build index 4d86de96..d2ccb921 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" - local install_dir="${MODULE_BUILD_DIR}/opt/openslx/share/java" + local install_dir="${MODULE_BUILD_DIR}/opt/openslx/vmchooser/plugins/qemu" 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 c1cdf05d..1914cffe 100644 --- a/core/modules/qemu/module.conf +++ b/core/modules/qemu/module.conf @@ -8,3 +8,7 @@ REQUIRED_MODULES=" REQUIRED_BINARIES="" REQUIRED_LIBRARIES="" REQUIRED_DIRECTORIES="" + +REQUIRED_FILES=" + /opt/openslx/vmchooser/plugins/qemu/runvirt-plugin-qemu.jar +" |