From: martin f. krafft <madduck@madduck.net>
Date: Wed, 12 Nov 2014 21:16:18 +0000 (+0100)
Subject: add --debug flag
X-Git-Url: https://git.madduck.net/code/vinst.git/commitdiff_plain/44c183155e8e208d4b381c63b92fcb910abc4c85?hp=01675c106afc9d3c07b770c25464a5f8c31da4c4

add --debug flag
---

diff --git a/vinst b/vinst
index 6b6ca5d..2de250e 100755
--- a/vinst
+++ b/vinst
@@ -15,6 +15,9 @@ RESTART=0
 
 while [ -n "$1" ]; do
   case "$1" in
+    (--debug)
+      DEBUG=1
+      ;;
     (-n|--name)
       shift
       if [ -z "$1" ]; then
@@ -110,10 +113,15 @@ BASEDIR=$(cd ${0%/*}; pwd)
 tmpdir=$(mktemp -d)
 tar -C $BASEDIR/preseed/$SUITE -cf $tmpdir/commands.tar commands
 
-extra_args="auto $CONSOLE \
+extra_kargs="auto $CONSOLE \
 hostname=${HOSTNAME%%.*} \
 domain=${HOSTNAME#*.}"
 
+extra_opts=
+if [ -n "$DEBUG" ]; then
+  extra_opts='--debug'
+fi
+
 if [ -n "$IPADDRESS" ]; then
   if [ -z "$GATEWAY" ] && [ -x $(command -v ipcalc) ]; then
     # default to the first IP in the network
@@ -123,7 +131,7 @@ if [ -n "$IPADDRESS" ]; then
   IPADDRESS="${IPADDRESS%/*}"
   : ${NAMESERVER:=$GATEWAY}
 
-  extra_args="$extra_args netcfg/disable_dhcp=true \
+  extra_kargs="$extra_kargs netcfg/disable_dhcp=true \
   netcfg/get_ipaddress=$IPADDRESS \
   netcfg/get_netmask=$NETMASK \
   netcfg/get_gateway=$GATEWAY \
@@ -132,7 +140,7 @@ if [ -n "$IPADDRESS" ]; then
   BRIDGE=wan
 
 else
-  extra_args="$extra_args netcfg/disable_dhcp=false"
+  extra_kargs="$extra_kargs netcfg/disable_dhcp=false"
   BRIDGE=virt-br
 fi
 
@@ -195,8 +203,8 @@ 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" \
+  --prompt --noautoconsole --autostart \
+  --extra-args="$extra_kargs" \
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME