X-Git-Url: https://git.madduck.net/code/vinst.git/blobdiff_plain/3bbd0b003dcc673442a31920a7c90ba99563ebb9..23c0e42920949f303e365f05cb6442f62bd19d26:/vinst?ds=inline

diff --git a/vinst b/vinst
index b6db695..9a13b35 100755
--- a/vinst
+++ b/vinst
@@ -10,6 +10,8 @@ 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
@@ -71,13 +73,20 @@ while [ -n "$1" ]; do
     (-a|--arch)
       shift
       if [ -z "$1" ]; then
-        echo >&2 'E: --arch/-a needs size argument'
+        echo >&2 'E: --arch/-a needs arch argument'
         exit 1
       fi
       ARCH="$1"
       ;;
     (--debug)
       DEBUG=1
+      set -vx
+      ;;
+    (--wipe)
+      WIPE=1
+      ;;
+    (--console)
+      RESTART=1
       ;;
   esac
   shift
@@ -128,7 +137,9 @@ cat >&2 <<_eof
       arch: $ARCH
        ram: $RAM MiB
       disk: $DISK GiB
+      wipe: $WIPE
    console: $CONSOLE
+   restart: $RESTART
 net bridge: $BRIDGE
 _eof
 if [ -n "$IPADDRESS" ]; then
@@ -146,10 +157,15 @@ 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
 
-[ $DEBUG = 1 ] && DEBUGFLAG=--debug
+if [ $DEBUG = 1 ]; then
+  DEBUGFLAG=--debug
+  extra_args="$extra_args DEBCONF_DEBUG=5"
+fi
 
 virt-install --connect=$QEMU_URI \
   ${DEBUGFLAG:-} \
@@ -164,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