make --debug also turn on shell and debconf debugging

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index c6abe7299c743083329be4493c74f7bad0925a24..8e157f10eb37a81ed94b81f1147ed96b897b02ca 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -9,6 +9,7 @@ STORAGE_POOL=default
 QEMU_URI=qemu:///system
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'
 QEMU_URI=qemu:///system
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'

+DEBUG=0

 
 while [ -n "$1" ]; do
   case "$1" in
 
 while [ -n "$1" ]; do
   case "$1" in


@@ -67,6 +68,18 @@ while [ -n "$1" ]; do
       fi
       DISK="$1"
       ;;
       fi
       DISK="$1"
       ;;

+    (-a|--arch)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --arch/-a needs size argument'
+        exit 1
+      fi
+      ARCH="$1"
+      ;;
+    (--debug)
+      DEBUG=1
+      set -vx
+      ;;

   esac
   shift
 done
   esac
   shift
 done


@@ -100,15 +113,24 @@ if [ -n "$IPADDRESS" ]; then
   netcfg/get_gateway=$GATEWAY \
   netcfg/get_nameservers=$NAMESERVER"
 
   netcfg/get_gateway=$GATEWAY \
   netcfg/get_nameservers=$NAMESERVER"
 

+  BRIDGE=wan
+

 else
   extra_args="$extra_args netcfg/disable_dhcp=false"
 else
   extra_args="$extra_args netcfg/disable_dhcp=false"

+  BRIDGE=virt-br
+fi
+
+if [ -z "$ARCH" ]; then
+  ARCH=$(dpkg --print-architecture)

 fi
 
 cat >&2 <<_eof
   hostname: $HOSTNAME
 fi
 
 cat >&2 <<_eof
   hostname: $HOSTNAME

+      arch: $ARCH

        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE
        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE

+net bridge: $BRIDGE

 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof


@@ -123,13 +145,21 @@ else
 _eof
 fi
 
 _eof
 fi
 

-exit 0
+echo >&2
+
+virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G

 
 

-exec virt-install --connect=$QEMU_URI \
+if [ $DEBUG = 1 ]; then
+  DEBUGFLAG=--debug
+  extra_args="$extra_args DEBCONF_DEBUG=5"
+fi
+
+virt-install --connect=$QEMU_URI \
+  ${DEBUGFLAG:-} \

   -n $HOSTNAME \
   -r $RAM \
   -n $HOSTNAME \
   -r $RAM \

-  --disk pool=default,size=$SIZE \
-  -w bridge=virt-br \
+  --disk vol=$STORAGE_POOL/virt-$HOSTNAME \
+  -w bridge=$BRIDGE \

   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \
   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \


@@ -137,6 +167,9 @@ exec 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" \
   --extra-args="$extra_args" \

-  --autostart \

   "$@"
   "$@"

+
+virsh --connect=$QEMU_URI console $HOSTNAME
+virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"