From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 11 Jun 2018 16:21:32 +0000 (-0300)
Subject: Install: use kvmx_up
X-Git-Tag: 0.1.0~255
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=607a5b91bc887f90655b7f08e76804ea41b4befd;p=kvmx.git

Install: use kvmx_up
---

diff --git a/kvmx b/kvmx
index 03687b1..2faf6c6 100755
--- a/kvmx
+++ b/kvmx
@@ -463,6 +463,12 @@ function kvmx_up {
     fi
   fi
 
+  # Check if on install mode
+  if [ "$install" == "1" ]; then
+    kvmx_status
+    return
+  fi
+
   if [ "$ssh_support" == "y" ]; then
     let ssh_attempts="0"
     echo -n "Waiting for machine to boot..."
@@ -1643,7 +1649,13 @@ function kvmx_install {
     qemu-img create -f $format $image $size
   fi
 
-  kvm -m $memory -net nic,model=virtio -net user -drive file=$image -cdrom $media
+  # Basic install command
+  #kvm -m $memory -net nic,model=virtio -net user -drive file=$image -cdrom $media
+
+  # Install using kvmx_up
+  install=1
+  cdrom=$media
+  kvmx_up
 }
 
 # Serial console