XenAPI: Recommend using xl console rather than vncviewer
Some vncviewers do not support the -via option, so default to suggesting
xl console. XenCenter continues to be an option for those running
Windows.
Change-Id: I1e53fd33d309e30a60031965e589167dcbacfbbe
diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh
index f28ae97..082c27e 100755
--- a/tools/xen/install_os_domU.sh
+++ b/tools/xen/install_os_domU.sh
@@ -149,12 +149,10 @@
function wait_for_VM_to_halt {
set +x
- echo "Waiting for the VM to halt. Progress in-VM can be checked with vncviewer:"
+ echo "Waiting for the VM to halt. Progress in-VM can be checked with XenCenter or xl console:"
mgmt_ip=$(echo $XENAPI_CONNECTION_URL | tr -d -c '1234567890.')
domid=$(get_domid "$GUEST_NAME")
- sleep 20 # Wait for the vnc-port to be written
- port=$(xenstore-read /local/domain/$domid/console/vnc-port)
- echo "vncviewer -via root@$mgmt_ip localhost:${port:2}"
+ echo "ssh root@$mgmt_ip \"xl console $domid\""
while true; do
state=$(xe_min vm-list name-label="$GUEST_NAME" power-state=halted)
if [ -n "$state" ]; then