Check for ssh support

diff --git a/kvmx b/kvmx
index b9523aa20aef1f4f5caa3528e313d35602130853..4d94cfb40c34c331034ec8cc9265e2a3bda02f97 100755 (executable)
--- a/kvmx
+++ b/kvmx
@@ -333,6 +333,11 @@ function kvmx_ssh {
     exit 1
   fi
 
+  if [ "$ssh_support" != "y" ]; then
+    echo "$BASENAME: SSH support for $VM is disabled"
+    exit 1
+  fi
+
   # Shift params according to how the program was called:
   # either "kvmx ssh" or "kvmx ssh guest".
   if [ "$ACTION" == "ssh" ]; then

diff --git a/kvmxfile b/kvmxfile
index 631678d7bf435d51abb8eedb0405756af9251e67..4d1c5028130cc7826aac8ddebe0f453f64b1761b 100644 (file)
--- a/kvmxfile
+++ b/kvmxfile
@@ -61,4 +61,6 @@ ssh_support="y"
 # Please note that this setting won't take effect if you're using a basebox.
 # In that case the basebox keypair will be used if it exists, otherwise kvmx
 # fallsback to the default insecure keypair.
+#
+# This setting is used during virtual machine bootstrapping by kvmx-create.
 ssh_custom="y"