From 5081d46d5a7ae2f1083c02bd8e42a44d230144b4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Wed, 25 Nov 2015 14:04:48 +0000
Subject: [PATCH] Improve post image creation instructions

---
 src/freedombone-image | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/freedombone-image b/src/freedombone-image
index 540931b2..67f71fdf 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -232,11 +232,29 @@ echo "
 Image was created.
 
 You will be able to log into it with:
-
-    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p 2222
+"
+if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then
+    echo "    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p 2222
 
     Password: $PASSWORD
 "
+else
+    if [[ $IMAGE_TYPE != "qemu"* ]]; then
+        echo "    Username: $USERNAME
+    Password: $PASSWORD
+"
+    else
+        if [[ $IMAGE_TYPE != "qemu-x86_64"* && $IMAGE_TYPE != "qemu-amd64"* ]]; then
+            echo "qemu-system-i386 $(ls ${PROJECT_NAME}*.qcow2)"
+        else
+            echo "qemu-system-x86_64 $(ls ${PROJECT_NAME}*.qcow2)"
+        fi
+        echo "
+    Username: $USERNAME
+    Password: $PASSWORD
+"
+    fi
+fi
 ls -lh ${PROJECT_NAME}*.img ${PROJECT_NAME}*.sig ${PROJECT_NAME}*.bz2 ${PROJECT_NAME}*.vdi ${PROJECT_NAME}*.qcow2
 
 # record the default login credentials for later use