diff options
| author | Manuel Bentele | 2021-07-05 13:05:10 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2021-07-05 13:05:10 +0200 |
| commit | f74a7b719242642e8e822df16da3829b421117f7 (patch) | |
| tree | cf5a0cdf9bda23ad4daf4f832bc1d1eed688b852 | |
| parent | Merge branch 'master' into installer (diff) | |
| parent | [qemu] Add user to 'dialout' group for serial/parport access (diff) | |
| download | mltk-f74a7b719242642e8e822df16da3829b421117f7.tar.gz mltk-f74a7b719242642e8e822df16da3829b421117f7.tar.xz mltk-f74a7b719242642e8e822df16da3829b421117f7.zip | |
Merge branch 'master' into installer
3 files changed, 12 insertions, 5 deletions
diff --git a/core/modules/qemu/data/opt/openslx/pam/hooks/auth-final-exec.d/40-add-to-dialout.sh b/core/modules/qemu/data/opt/openslx/pam/hooks/auth-final-exec.d/40-add-to-dialout.sh new file mode 100644 index 00000000..752344a2 --- /dev/null +++ b/core/modules/qemu/data/opt/openslx/pam/hooks/auth-final-exec.d/40-add-to-dialout.sh @@ -0,0 +1,5 @@ +#!/bin/ash + +adduser "${PAM_USER}" "dialout" + +exit 0 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 c3dfd21d..04dca832 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 @@ -35,8 +35,10 @@ run_plugin() { vm_diskfile="${VM_DISKFILE_RW}" fi - # write finalized config to temporary folder for debugging purposes - local vm_final_run_file="/tmp/qemu-last-config.xml" + # write finalized config in debug mode to temporary folder for debugging purposes + if [ "${DEBUG}" = "true" ]; then + local vm_final_config="/tmp/qemu-last-config.xml" + fi # call the Libvirt Java tool to finalize configuration and start VM declare -rg VIRTCMD="java" @@ -47,7 +49,7 @@ run_plugin() { notempty VM_DISPLAYNAME && VIRTCMDOPTS+=( "-vmdsplname" "${VM_DISPLAYNAME}" ) notempty VM_OS_TYPE && VIRTCMDOPTS+=( "-vmos" "${VM_OS_TYPE}" ) notempty TMPCONFIG && VIRTCMDOPTS+=( "-vmcfginp" "${TMPCONFIG}" ) - notempty vm_final_run_file && VIRTCMDOPTS+=( "-vmcfgout" "${vm_final_run_file}" ) + notempty vm_final_config && VIRTCMDOPTS+=( "-vmcfgout" "${vm_final_config}" ) notempty IMGUUID && VIRTCMDOPTS+=( "-vmuuid" "${IMGUUID}" ) notempty HW_CORES && VIRTCMDOPTS+=( "-vmncpus" "${HW_CORES}" ) notempty VM_MEM && VIRTCMDOPTS+=( "-vmmem" "${VM_MEM}" ) diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/viewer/ViewerVirtViewer.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/viewer/ViewerVirtViewer.java index 8f6e9481..d696e109 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/viewer/ViewerVirtViewer.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/viewer/ViewerVirtViewer.java @@ -90,8 +90,8 @@ public class ViewerVirtViewer extends Viewer } // execute viewer process with arguments: - // "virt-viewer --full-screen --reconnect --wait --attach --connect=<URI> --domain-name -- <DOMAIN-UUID>" - ViewerUtils.executeViewer( ViewerVirtViewer.NAME, new String[] { "--full-screen", "--reconnect", "--wait", + // "virt-viewer --full-screen --wait --attach --connect=<URI> --domain-name -- <DOMAIN-UUID>" + ViewerUtils.executeViewer( ViewerVirtViewer.NAME, new String[] { "--full-screen", "--wait", "--attach", "--connect=" + connectionUri, "--uuid", "--", machineUuid } ); } } |