Rename qvm-showterminal to qvm-terminal and add print_usage

Makefile

@@ -317,7 +317,7 @@ install-common: install-doc
 	
 	install -m 0755 misc/tinyproxy-wrapper $(DESTDIR)/usr/lib/qubes/tinyproxy-wrapper
 
-	install -m 0755 misc/qvm-showterminal $(DESTDIR)$(BINDIR)/qvm-showterminal
+	install -m 0755 misc/qvm-terminal $(DESTDIR)$(BINDIR)/qvm-terminal
 
 	install -d $(DESTDIR)/var/run/qubes
 	install -d $(DESTDIR)/rw

debian/qubes-core-agent.install

@@ -100,7 +100,7 @@ usr/bin/qvm-move-to-vm
 usr/bin/qvm-open-in-dvm
 usr/bin/qvm-open-in-vm
 usr/bin/qvm-run-vm
-usr/bin/qvm-showterminal
+usr/bin/qvm-terminal
 usr/bin/qvm-sync-clock
 usr/bin/xenstore-watch-qubes
 usr/lib/python2.7/dist-packages/qubesagent-*.egg-info/*

misc/qvm-terminal

@@ -1,12 +1,25 @@
 #!/bin/bash
+
+print_usage() {
+cat >&2 <<USAGE
+Usage: $0 vmname
+Connects to another VM console using the admin.vm.Terminal 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" qubes.ShowTerminal 2>/dev/null
+    qrexec-client-vm "$QREXEC_REQUESTED_TARGET" admin.vm.Terminal
 
-    # exit code 200 is flock exit code in qubes.ShowTerminal
+    # exit code 200 is flock exit code in admin.vm.Terminal
     exit_code=$?
     if [ $exit_code -gt 0 ]; then
         if [ $exit_code -ne 200 ]; then
@@ -20,5 +33,6 @@ qrexec_console() {
 
 export -f qrexec_console
 
+printf 'Use "Control-Shift-o" to exit remote console\n'
 socat file:/dev/tty,rawer,escape=0x0f SYSTEM:"qrexec_console $QREXEC_REQUESTED_TARGET" 2>/dev/null
 printf '\n'

rpm_spec/core-agent.spec.in

@@ -627,7 +627,7 @@ rm -f %{name}-%{version}
 /usr/bin/qubes-run-terminal
 /usr/bin/qubes-open
 /usr/bin/qubes-session-autostart
-/usr/bin/qvm-showterminal
+/usr/bin/qvm-terminal
 %dir /usr/lib/qubes
 /usr/lib/qubes/prepare-suspend
 /usr/lib/qubes/qfile-agent