aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-03-24 15:26:02 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-03-24 15:26:02 -0300
commit5d23ad41ed3db5b82315d1de35a748ab4506d431 (patch)
treebef1163a4ea30dc721cc284ce376f35e4e235608
parentf365cc0d217c895d1741c5cba8b03dd75064e33f (diff)
downloadkvmx-5d23ad41ed3db5b82315d1de35a748ab4506d431.tar.gz
kvmx-5d23ad41ed3db5b82315d1de35a748ab4506d431.tar.bz2
Check for ssh support
-rwxr-xr-xkvmx5
-rw-r--r--kvmxfile2
2 files changed, 7 insertions, 0 deletions
diff --git a/kvmx b/kvmx
index b9523aa..4d94cfb 100755
--- 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 631678d..4d1c502 100644
--- 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"