Guess image name by hostname first if no image param is found

2 files changed, 12 insertions, 2 deletions

diff --git a/kvmx b/kvmx
index 5982754..44ecdd2 100755
--- a/kvmx
+++ b/kvmx
@@ -128,7 +128,17 @@ function __kvmx_initialize {
         image_base="$HOME/.local/share/kvmx"
       fi
 
-      image="$image_base/$VM/box.img"
+      # There might be trouble managing the guest when project folder name is different from
+      # hostname and no image param is set (kvmx-create puts image in one
+      # place, kvmx expects in the other). So we try to guess first the image by hostname
+      # and then by guest name. Note that it might be possible to have conflicts if there
+      # are machines with hostnames set to the name os other machines. But here we hope that
+      # the user is not messing that much ;)
+      if [ ! -z "$hostname" ] && [ -e "$image_base/$hostname/box.img" ]; then
+        image="$image_base/$hostname/box.img"
+      else
+        image="$image_base/$VM/box.img"
+      fi
     fi
 
     # Box and folder config
diff --git a/kvmx-create b/kvmx-create
index 16349c0..36d3795 100755
--- a/kvmx-create
+++ b/kvmx-create
@@ -119,7 +119,7 @@ function kvmx_config {
     image="$image_base/$hostname/box.img"
   else
     image_base="$HOME/.local/share/kvmx"
-    kvmx_user_config image             $image_base/debian/box.img       "Destination image (ending in .img)"
+    kvmx_user_config image             $image_base/$hostname/box.img    "Destination image (ending in .img)"
   fi
 
   kvmx_user_config   size              3G                               "Image size"