add --debug flag

diff --git a/vinst b/vinst
index 6b6ca5dc60ef4009f137f5fcba3ee09e1e70d0f0..2de250e051e9522bbda5e5dd33feffa2bf5b7620 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -15,6 +15,9 @@ RESTART=0
 
 while [ -n "$1" ]; do
   case "$1" in
 
 while [ -n "$1" ]; do
   case "$1" in

+    (--debug)
+      DEBUG=1
+      ;;

     (-n|--name)
       shift
       if [ -z "$1" ]; then
     (-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
 
 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#*.}"
 
 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
 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}
 
   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 \
   netcfg/get_ipaddress=$IPADDRESS \
   netcfg/get_netmask=$NETMASK \
   netcfg/get_gateway=$GATEWAY \


@@ -132,7 +140,7 @@ if [ -n "$IPADDRESS" ]; then
   BRIDGE=wan
 
 else
   BRIDGE=wan
 
 else

-  extra_args="$extra_args netcfg/disable_dhcp=false"
+  extra_kargs="$extra_kargs netcfg/disable_dhcp=false"

   BRIDGE=virt-br
 fi
 
   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 \
   -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
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME