From 2741dfd3a22a531e7c2ce4f2a4d98d9f6fd2cc9a Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Thu, 8 Aug 2024 13:53:21 +0200 Subject: [PATCH 1/3] Add manual option to allow using an existing Windows installation Signed-off-by: Felix Bartels --- README.md | 1 + installer.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index ec1fdf4..12c9dde 100644 --- a/README.md +++ b/README.md @@ -348,6 +348,7 @@ RDP_IP="" # - 'docker' # - 'podman' # - 'libvirt' +# - 'manual' WAFLAVOR="docker" # [DISPLAY SCALING FACTOR] diff --git a/installer.sh b/installer.sh index 83f6932..9fea1d6 100755 --- a/installer.sh +++ b/installer.sh @@ -1493,6 +1493,9 @@ function waInstall() { # Check if the Windows VM is powered on. waCheckVMRunning + elif [ "$WAFLAVOR" = "manual" ]; then + # TODO do some checks for an existing windows vm + echo "Using existing vm" else # Display the error type. echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}INVALID WINAPPS BACKEND.${CLEAR_TEXT}" From 3e6a27f4ea62d21f2fc93d59fa6a126542ff2e4f Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Thu, 8 Aug 2024 14:11:40 +0200 Subject: [PATCH 2/3] Replace todo with existing port check option Signed-off-by: Felix Bartels --- installer.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/installer.sh b/installer.sh index 9fea1d6..554a373 100755 --- a/installer.sh +++ b/installer.sh @@ -1494,8 +1494,7 @@ function waInstall() { # Check if the Windows VM is powered on. waCheckVMRunning elif [ "$WAFLAVOR" = "manual" ]; then - # TODO do some checks for an existing windows vm - echo "Using existing vm" + waCheckPortOpen else # Display the error type. echo -e "${ERROR_TEXT}ERROR:${CLEAR_TEXT} ${BOLD_TEXT}INVALID WINAPPS BACKEND.${CLEAR_TEXT}" From aa4aabcfeb1f6227f40d28492e723cbeb0fe3742 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Thu, 8 Aug 2024 16:38:08 +0200 Subject: [PATCH 3/3] Also add manual option to winapps binary Signed-off-by: Felix Bartels --- bin/winapps | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/winapps b/bin/winapps index b9dacfc..a1e2efd 100755 --- a/bin/winapps +++ b/bin/winapps @@ -675,6 +675,8 @@ if [ "$WAFLAVOR" = "docker" ] || [ "$WAFLAVOR" = "podman" ]; then elif [ "$WAFLAVOR" = "libvirt" ]; then waCheckGroupMembership waCheckVMRunning +elif [ "$WAFLAVOR" = "manual" ]; then + waCheckPortOpen else waThrowExit "$EC_INVALID_FLAVOR" fi