resort partman preseeding

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index 66b70aa087442fa7e2ee48c5f112e964f77bcdb7..f323d56fcbd0e39d489272129c96123efa117e6c 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'
+DEBUG=0
 
 while [ -n "$1" ]; do
   case "$1" in
@@ -35,6 +36,14 @@ while [ -n "$1" ]; do
       esac
       IPADDRESS="$1"
       ;;
+    (-d|--dns)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --dns/-d needs IP address'
+        exit 1
+      fi
+      NAMESERVER="$1"
+      ;;
     (-g|--gateway)
       shift
       if [ -z "$1" ]; then
@@ -59,6 +68,17 @@ while [ -n "$1" ]; do
       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
+      ;;
   esac
   shift
 done
@@ -92,15 +112,24 @@ if [ -n "$IPADDRESS" ]; then
   netcfg/get_gateway=$GATEWAY \
   netcfg/get_nameservers=$NAMESERVER"
 
+  BRIDGE=wan
+
 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
+      arch: $ARCH
        ram: $RAM MiB
       disk: $DISK GiB
    console: $CONSOLE
+net bridge: $BRIDGE
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
@@ -115,13 +144,19 @@ else
 _eof
 fi
 
-exit 0
+echo >&2
+
+set -v
+virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
 
-exec virt-install --connect=$QEMU_URI \
+[ $DEBUG = 1 ] && DEBUGFLAG=--debug
+
+virt-install --connect=$QEMU_URI \
+  ${DEBUGFLAG:-} \
   -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 \
@@ -129,6 +164,9 @@ exec 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" \
-  --autostart \
   "$@"
+
+virsh --connect=$QEMU_URI console $HOSTNAME
+virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"