Move qvm-console
to core-admin-client repository
This commit is contained in:
parent
4de377bc3b
commit
f5faa62876
1
debian/qubes-core-agent.install
vendored
1
debian/qubes-core-agent.install
vendored
@ -109,7 +109,6 @@ usr/bin/qvm-open-in-dvm
|
|||||||
usr/bin/qvm-open-in-vm
|
usr/bin/qvm-open-in-vm
|
||||||
usr/bin/qvm-run-vm
|
usr/bin/qvm-run-vm
|
||||||
usr/bin/qvm-connect-tcp
|
usr/bin/qvm-connect-tcp
|
||||||
usr/bin/qvm-console
|
|
||||||
usr/bin/qvm-sync-clock
|
usr/bin/qvm-sync-clock
|
||||||
usr/lib/python3/dist-packages/qubesagent-*.egg-info/*
|
usr/lib/python3/dist-packages/qubesagent-*.egg-info/*
|
||||||
usr/lib/python3/dist-packages/qubesagent/*
|
usr/lib/python3/dist-packages/qubesagent/*
|
||||||
|
@ -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'
|
|
@ -638,7 +638,6 @@ rm -f %{name}-%{version}
|
|||||||
/usr/bin/qubes-run-gnome-terminal
|
/usr/bin/qubes-run-gnome-terminal
|
||||||
/usr/bin/qubes-open
|
/usr/bin/qubes-open
|
||||||
/usr/bin/qubes-session-autostart
|
/usr/bin/qubes-session-autostart
|
||||||
/usr/bin/qvm-console
|
|
||||||
/usr/bin/qvm-connect-tcp
|
/usr/bin/qvm-connect-tcp
|
||||||
/usr/bin/qubes-vmexec
|
/usr/bin/qubes-vmexec
|
||||||
%dir /usr/lib/qubes
|
%dir /usr/lib/qubes
|
||||||
|
Loading…
Reference in New Issue
Block a user