fix --arch error message

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index 9a8eb90769e8dc72a1286b87d9a3248313b8b1f4..9a13b359f7ed2650f40226850a659353fd0a53d1 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -9,6 +9,9 @@ STORAGE_POOL=default
 QEMU_URI=qemu:///system
 SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'
+DEBUG=0
+WIPE=0
+RESTART=0
 
 while [ -n "$1" ]; do
   case "$1" in
@@ -35,6 +38,22 @@ 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
+        echo >&2 'E: --gateway/-g needs IP address'
+        exit 1
+      fi
+      GATEWAY="$1"
+      ;;
     (-r|--ram)
       shift
       if [ -z "$1" ]; then
@@ -51,6 +70,24 @@ while [ -n "$1" ]; do
       fi
       DISK="$1"
       ;;
+    (-a|--arch)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --arch/-a needs arch argument'
+        exit 1
+      fi
+      ARCH="$1"
+      ;;
+    (--debug)
+      DEBUG=1
+      set -vx
+      ;;
+    (--wipe)
+      WIPE=1
+      ;;
+    (--console)
+      RESTART=1
+      ;;
   esac
   shift
 done
@@ -70,7 +107,7 @@ hostname=${HOSTNAME%%.*} \
 domain=${HOSTNAME#*.}"
 
 if [ -n "$IPADDRESS" ]; then
-  if [ -z "$GATEWAY" ]; then
+  if [ -z "$GATEWAY" ] && [ -x $(command -v ipcalc) ]; then
     # default to the first IP in the network
     GATEWAY=$(ipcalc $IPADDRESS | grep HostMin | awk '{print $2}')
   fi
@@ -84,15 +121,26 @@ 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
+      wipe: $WIPE
    console: $CONSOLE
+   restart: $RESTART
+net bridge: $BRIDGE
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
@@ -107,13 +155,24 @@ else
 _eof
 fi
 
-exit 0
+echo >&2
 
-exec virt-install --connect=$QEMU_URI \
+virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
+if [ $WIPE = 1 ]; then
+  virsh --connect=$QEMU_URI vol-wipe --pool $STORAGE_POOL --algorithm zero virt-$HOSTNAME
+fi
+
+if [ $DEBUG = 1 ]; then
+  DEBUGFLAG=--debug
+  extra_args="$extra_args DEBCONF_DEBUG=5"
+fi
+
+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 \
@@ -121,6 +180,12 @@ 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
+
+if [ $RESTART = 1]; then
+  virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
+fi