X-Git-Url: https://git.madduck.net/code/vinst.git/blobdiff_plain/3e94d8ee6d8b6acd6711e891d543864293e00f97..6a3968790b2b2704e57aa4d0e272fb4abbc3d369:/vinst

diff --git a/vinst b/vinst
index 51a87e9..dc0b82b 100755
--- a/vinst
+++ b/vinst
@@ -9,6 +9,9 @@ STORAGE_POOL=default
 QEMU_URI=qemu:///system
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'
+DEBUG=0
+WIPE=0
+RESTART=0
 
 while [ -n "$1" ]; do
   case "$1" in
@@ -67,6 +70,24 @@ 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
+      set -vx
+      ;;
+    (--wipe)
+      WIPE=1
+      ;;
+    (--console)
+      RESTART=1
+      ;;
   esac
   shift
 done
@@ -107,11 +128,18 @@ 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
+      wipe: $WIPE
    console: $CONSOLE
+   restart: $RESTART
 net bridge: $BRIDGE
 _eof
 if [ -n "$IPADDRESS" ]; then
@@ -127,11 +155,20 @@ else
 _eof
 fi
 
+echo >&2
 
-set -v
 virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
+if [ $WIPE = 1 ]; then
+  virsh --connect=$QEMU_URI vol-wipe --pool $STORAGE_POOL --algorithm zero virt-$HOSTNAME
+fi
+
+if [ $DEBUG = 1 ]; then
+  DEBUGFLAG=--debug
+  extra_args="$extra_args DEBCONF_DEBUG=5"
+fi
 
 virt-install --connect=$QEMU_URI \
+  ${DEBUGFLAG:-} \
   -n $HOSTNAME \
   -r $RAM \
   --disk vol=$STORAGE_POOL/virt-$HOSTNAME \
@@ -143,9 +180,12 @@ virt-install --connect=$QEMU_URI \
   -l $BASEDIR/installer-amd64 \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \
-  --prompt --noautoconsole --autostart \
+  --noautoconsole --autostart \
   --extra-args="$extra_args" \
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME
-virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
+
+if [ $RESTART = 1]; then
+  virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
+fi