fix --arch error message

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index e931fc396b2fca04fe08c123a1760adca9269128..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'
 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
 
 while [ -n "$1" ]; do
   case "$1" in


@@ -67,6 +70,24 @@ while [ -n "$1" ]; do
       fi
       DISK="$1"
       ;;
       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
   esac
   shift
 done


@@ -107,11 +128,18 @@ else
   BRIDGE=virt-br
 fi
 
   BRIDGE=virt-br
 fi
 

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

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

+      arch: $ARCH

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

+      wipe: $WIPE

    console: $CONSOLE
    console: $CONSOLE

+   restart: $RESTART

 net bridge: $BRIDGE
 _eof
 if [ -n "$IPADDRESS" ]; then
 net bridge: $BRIDGE
 _eof
 if [ -n "$IPADDRESS" ]; then


@@ -127,9 +155,20 @@ else
 _eof
 fi
 
 _eof
 fi
 

-exit 0
+echo >&2
+
+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

 
 

-exec virt-install --connect=$QEMU_URI \
+virt-install --connect=$QEMU_URI \
+  ${DEBUGFLAG:-} \

   -n $HOSTNAME \
   -r $RAM \
   --disk vol=$STORAGE_POOL/virt-$HOSTNAME \
   -n $HOSTNAME \
   -r $RAM \
   --disk vol=$STORAGE_POOL/virt-$HOSTNAME \


@@ -141,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 \
   -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
+
+if [ $RESTART = 1]; then
+  virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
+fi