From 0fd4a6721d066a9adbc16009b7b787553074418e Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 22 May 2020 11:42:04 -0300
Subject: Fix: ssh pubkey file name evaluation

---
 kvmx        | 3 ++-
 kvmx-create | 3 +++
 kvmxfile    | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kvmx b/kvmx
index 204a25b..d380b55 100755
--- a/kvmx
+++ b/kvmx
@@ -152,7 +152,7 @@ function __kvmx_initialize {
       # 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
+      # are machines with hostnames set to the name of 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"
@@ -1274,6 +1274,7 @@ function kvmx_init {
   if [ ! -e "$FOLDER/kvmxfile" ]; then
     cp $APP_BASE/kvmxfile $FOLDER/
     sed -i -e "s|hostname=\"machine\"|hostname=\"$VM\"|g" $FOLDER/kvmxfile
+    sed -i -e "s|hostname=\"kvmx\"|hostname=\"$VM\"|g" $FOLDER/kvmxfile
   fi
 
   # Create config entry
diff --git a/kvmx-create b/kvmx-create
index f1d998e..f31ec5b 100755
--- a/kvmx-create
+++ b/kvmx-create
@@ -423,6 +423,9 @@ EOF
   # Initial user homedir
   kvmx_sudo_run mkdir -p $WORK/home/$user
 
+  # There might be trouble managing the guest SSH keys when project folder name is different from
+  # hostname: while kvmx-create uses $hostname to guess the pubkey file name, kvmx uses $VM.
+  # Here we hope that # the user is not messing that much ;)
   #if [ "$ssh_support" == "y" ]; then
   if [ "$ssh_custom" == "y" ]; then
     if [ ! -z "$ssh_custom_pubkey" ]; then
diff --git a/kvmxfile b/kvmxfile
index eb80177..25f676d 100644
--- a/kvmxfile
+++ b/kvmxfile
@@ -2,6 +2,9 @@
 # Sample kvmx file - https://kvmx.fluxo.info
 #
 
+# Hostname
+hostname="kvmx"
+
 # Which base box you should use. Leave unconfigured to use kvmx-create instead.
 #basebox="buster"
 
@@ -151,9 +154,6 @@ qcow2_compression="1"
 # Bootstrap method: custom or vmdeboostrap
 method="custom"
 
-# Hostname
-hostname="kvmx"
-
 # Domain
 domain="example.org"
 
-- 
cgit v1.2.3