remove --prompt mode

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index e931fc396b2fca04fe08c123a1760adca9269128..f323d56fcbd0e39d489272129c96123efa117e6c 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -9,6 +9,7 @@ STORAGE_POOL=default
 QEMU_URI=qemu:///system
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'
+DEBUG=0
 
 while [ -n "$1" ]; do
   case "$1" in
@@ -67,6 +68,17 @@ while [ -n "$1" ]; do
       fi
       DISK="$1"
       ;;
+    (-a|--arch)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --arch/-a needs size argument'
+        exit 1
+      fi
+      ARCH="$1"
+      ;;
+    (--debug)
+      DEBUG=1
+      ;;
   esac
   shift
 done
@@ -107,8 +119,13 @@ else
   BRIDGE=virt-br
 fi
 
+if [ -z "$ARCH" ]; then
+  ARCH=$(dpkg --print-architecture)
+fi
+
 cat >&2 <<_eof
   hostname: $HOSTNAME
+      arch: $ARCH
        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE
@@ -127,9 +144,15 @@ else
 _eof
 fi
 
-exit 0
+echo >&2
+
+set -v
+virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
 
-exec virt-install --connect=$QEMU_URI \
+[ $DEBUG = 1 ] && DEBUGFLAG=--debug
+
+virt-install --connect=$QEMU_URI \
+  ${DEBUGFLAG:-} \
   -n $HOSTNAME \
   -r $RAM \
   --disk vol=$STORAGE_POOL/virt-$HOSTNAME \
@@ -141,6 +164,9 @@ exec virt-install --connect=$QEMU_URI \
   -l $BASEDIR/installer-amd64 \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \
+  --noautoconsole --autostart \
   --extra-args="$extra_args" \
-  --autostart \
   "$@"
+
+virsh --connect=$QEMU_URI console $HOSTNAME
+virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"