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

diff --git a/vinst b/vinst
index b6db695..8e157f1 100755
--- a/vinst
+++ b/vinst
@@ -78,6 +78,7 @@ while [ -n "$1" ]; do
       ;;
     (--debug)
       DEBUG=1
+      set -vx
       ;;
   esac
   shift
@@ -146,10 +147,12 @@ fi
 
 echo >&2
 
-set -v
 virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
 
-[ $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 +167,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" \
   "$@"