[looking-glass-client] Use CMake's generated install target for installationfeature/latest-qemu

3 files changed, 14 insertions, 11 deletions

diff --git a/core/modules/looking-glass-client/module.build b/core/modules/looking-glass-client/module.build
index 52609237..179d7e72 100644
--- a/core/modules/looking-glass-client/module.build
+++ b/core/modules/looking-glass-client/module.build
@@ -6,17 +6,19 @@ fetch_source() {
 
 build() {
 	local SRCDIR="${MODULE_WORK_DIR}/src/LookingGlass"
-	local CLIENTBUILDDIR="client/build"
-	mkdir -p "${SRCDIR}/${CLIENTBUILDDIR}" || perror "Failed to create CMake build directory!"
-	cde "${SRCDIR}/${CLIENTBUILDDIR}"
+	local DSTDIR="${MODULE_BUILD_DIR}"
+
+	mkdir -p "${SRCDIR}/client/build" || perror "Failed to create CMake build directory!"
+	cde "${SRCDIR}/client/build"
+
 	cmake -DENABLE_WAYLAND=no \
 		-DENABLE_X11=yes \
+		-DCMAKE_INSTALL_PREFIX=/usr \
 		../ || perror "'cmake' failed."
 	make || perror "'make' failed."
-	mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/bin"
-	cp "${SRCDIR}/${CLIENTBUILDDIR}/looking-glass-client" "${MODULE_BUILD_DIR}/opt/openslx/bin/looking-glass-client" || perror "'cp' failed."
+	DESTDIR="${DSTDIR}" make install || perror "'make install' failed."
 }
 
 post_copy() {
 	:
-}
\ No newline at end of file
+}
diff --git a/core/modules/looking-glass-client/module.conf b/core/modules/looking-glass-client/module.conf
index a8e7263d..271680d5 100644
--- a/core/modules/looking-glass-client/module.conf
+++ b/core/modules/looking-glass-client/module.conf
@@ -1,7 +1,8 @@
 #!/bin/bash
-REQUIRED_BINARIES="
-	looking-glass-client
-"
+
 REQUIRED_GIT="
 	https://github.com/gnif/LookingGlass.git||Release/B4
 "
+
+# copy everything since there is a clean installation done by 'make install'
+REQUIRED_DIRECTORIES="/"
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/viewer/ViewerVirtManager.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/viewer/ViewerVirtManager.java
index 1848d975..b0366428 100644
--- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/viewer/ViewerVirtManager.java
+++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/viewer/ViewerVirtManager.java
@@ -68,8 +68,8 @@ public class ViewerVirtManager extends Viewer
 		}
 
 		// execute viewer process with arguments:
-		// "virt-viewer --connect=<URI> --show-domain-console <DOMAIN-UUID>"
+		// "virt-manager --no-fork --connect=<URI> --show-domain-console=<DOMAIN-UUID>"
 		ViewerUtils.executeViewer( ViewerVirtManager.NAME,
-				new String[] { "--connect=" + connectionUri, "--show-domain-console", machineUuid } );
+				new String[] { "--no-fork", "--connect=" + connectionUri, "--show-domain-console=" + machineUuid } );
 	}
 }