1 files changed, 9 insertions, 1 deletions
diff --git a/kvmx b/kvmx
index a6bd52c..6f9c582 100755
--- a/kvmx
+++ b/kvmx
@@ -74,7 +74,6 @@ function __kvmx_initialize {
   # Default parameters
   PORT="$(($RANDOM + 1024))"
   SSH="$(($PORT + 22))"
-  SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=FATAL -o ProxyCommand=none -i $APP_BASE/share/ssh/insecure_private_key"
   SSH_LOGIN="user"
 
   # Initalize
@@ -112,6 +111,15 @@ function __kvmx_initialize {
     SSHFILE="$STATE_DIR/ssh"
     LOGFILE="$STATE_DIR/log"
     SPICEFILE="$STATE_DIR/spice"
+
+    if [ -e "$STORAGE/$VM.key" ]; then
+      SSHKEY="$STORAGE/$VM.key"
+    else
+      SSHKEY="$APP_BASE/share/ssh/insecure_private_key"
+    fi
+
+    SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=FATAL -o ProxyCommand=none -i $SSHKEY"
+
     mkdir -p $STATE_DIR
 
     if [ ! -e "$image" ] && [ "$ACTION" != "up" ] && [ "$ACTION" != "purge" ] && [ "$ACTION" != "destroy" ]; then