X-Git-Url: https://git.madduck.net/code/vinst.git/blobdiff_plain/3bbd0b003dcc673442a31920a7c90ba99563ebb9..3f34df1b2d831f855b18496f264ca233b45ca588:/vinst

diff --git a/vinst b/vinst
index b6db695..02fcef1 100755
--- a/vinst
+++ b/vinst
@@ -10,6 +10,7 @@ QEMU_URI=qemu:///system
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'
 DEBUG=0
+WIPE=0
 
 while [ -n "$1" ]; do
   case "$1" in
@@ -78,6 +79,10 @@ while [ -n "$1" ]; do
       ;;
     (--debug)
       DEBUG=1
+      set -vx
+      ;;
+    (--wipe)
+      WIPE=1
       ;;
   esac
   shift
@@ -128,6 +133,7 @@ cat >&2 <<_eof
       arch: $ARCH
        ram: $RAM MiB
       disk: $DISK GiB
+      wipe: $WIPE
    console: $CONSOLE
 net bridge: $BRIDGE
 _eof
@@ -146,10 +152,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,7 +175,7 @@ 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" \
   "$@"