From f5faa62876182304887a1a5e3c91c30a21d7c800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20Piotr=20=C5=BBo=C5=82nowski?=
 <aidecoe@aidecoe.name>
Date: Sat, 7 Dec 2019 16:22:30 +0000
Subject: [PATCH] Move `qvm-console` to core-admin-client repository

---
 debian/qubes-core-agent.install |  1 -
 misc/qvm-console                | 38 ---------------------------------
 rpm_spec/core-agent.spec.in     |  1 -
 3 files changed, 40 deletions(-)
 delete mode 100755 misc/qvm-console

diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 8a887c7..36984a9 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -109,7 +109,6 @@ usr/bin/qvm-open-in-dvm
 usr/bin/qvm-open-in-vm
 usr/bin/qvm-run-vm
 usr/bin/qvm-connect-tcp
-usr/bin/qvm-console
 usr/bin/qvm-sync-clock
 usr/lib/python3/dist-packages/qubesagent-*.egg-info/*
 usr/lib/python3/dist-packages/qubesagent/*
diff --git a/misc/qvm-console b/misc/qvm-console
deleted file mode 100755
index addfee3..0000000
--- a/misc/qvm-console
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-print_usage() {
-cat >&2 <<USAGE
-Usage: $0 vmname
-Connects to another VM console using the admin.vm.Console RPC service.
-USAGE
-}
-
-if [ $# -lt 1 ] ; then
-    print_usage
-    exit 1
-fi
-
-QREXEC_REQUESTED_TARGET="$1"
-
-qrexec_console() {
-    QREXEC_REQUESTED_TARGET="$1"
-
-    qrexec-client-vm "$QREXEC_REQUESTED_TARGET" admin.vm.Console
-
-    # exit code 200 is flock exit code in admin.vm.Console
-    exit_code=$?
-    if [ $exit_code -gt 0 ]; then
-        if [ $exit_code -ne 200 ]; then
-            printf "Cannot connect to %s" "$QREXEC_REQUESTED_TARGET"
-        else
-            printf "A qube is already connected to %s" "$QREXEC_REQUESTED_TARGET"
-        fi
-        exit 1
-    fi
-}
-
-export -f qrexec_console
-
-printf "Use '^]' to exit remote console\n"
-socat file:/dev/tty,rawer,escape=0x1d EXEC:"/bin/bash -c \'qrexec_console $QREXEC_REQUESTED_TARGET 2>/dev/null\'"
-printf '\n'
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index d0e1e36..ab8d1a1 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -638,7 +638,6 @@ rm -f %{name}-%{version}
 /usr/bin/qubes-run-gnome-terminal
 /usr/bin/qubes-open
 /usr/bin/qubes-session-autostart
-/usr/bin/qvm-console
 /usr/bin/qvm-connect-tcp
 /usr/bin/qubes-vmexec
 %dir /usr/lib/qubes