1 files changed, 3 insertions, 2 deletions
diff --git a/kvmx b/kvmx
index 4eba46d..2a11eaf 100755
--- a/kvmx
+++ b/kvmx
@@ -265,7 +265,7 @@ function kvmx_up {
     if [ ! -z "$basebox" ]; then
       if [ -e "$GLOBAL_USER_CONFIG_FOLDER/$basebox" ]; then
         baseimage="`kvmx list_image $basebox`"
-        basekey="$(ls `dirname $baseimage`/ssh/*.key)"
+        basekey="$(ls `dirname $baseimage`/ssh/$basebox.key)"
 
         if [ ! -e "$baseimage" ]; then
           echo "$BASENAME: could not find basebox $baseimage. Please create it first."
@@ -280,7 +280,8 @@ function kvmx_up {
         fi
 
         if [ -e "$basekey" ]; then
-          imagekey="`dirname $image`/ssh/`basename $image .img`.key"
+          vmname="$(basename `dirname $image`)"
+          imagekey="`dirname $image`/ssh/$vmname.key"
           mkdir -p "`dirname $image`/ssh"
 
           cp $basekey     $imagekey