fix name of --restart option

[code/vinst.git] / vinst

diff --git a/vinst b/vinst
index 6ca0f76a096c516a7aa2a2e9f0daa56d4a3bff78..06f4a25d00286ff3995ab91baa7f6aa5a641ddb3 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


@@ -70,11 +73,29 @@ while [ -n "$1" ]; do
     (-a|--arch)
       shift
       if [ -z "$1" ]; then
     (-a|--arch)
       shift
       if [ -z "$1" ]; then

-        echo >&2 'E: --arch/-a needs size argument'
+        echo >&2 'E: --arch/-a needs arch argument'

         exit 1
       fi
       ARCH="$1"
       ;;
         exit 1
       fi
       ARCH="$1"
       ;;

+    (-m|--mac)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --mac/-m needs mac address argument'
+        exit 1
+      fi
+      MAC="$1"
+      ;;
+    (--debug)
+      DEBUG=1
+      set -vx
+      ;;
+    (--wipe)
+      WIPE=1
+      ;;
+    (--restart)
+      RESTART=1
+      ;;

   esac
   shift
 done
   esac
   shift
 done


@@ -119,13 +140,21 @@ if [ -z "$ARCH" ]; then
   ARCH=$(dpkg --print-architecture)
 fi
 
   ARCH=$(dpkg --print-architecture)
 fi
 

+if [ -z "$MAC" ]; then
+  bytes=$(dd status=none if=/dev/urandom bs=3 count=1 | hexdump -v -e '/1 ":%02X"')
+  MAC=52:54:00$bytes
+fi
+

 cat >&2 <<_eof
   hostname: $HOSTNAME
       arch: $ARCH
        ram: $RAM MiB
       disk: $DISK GiB
 cat >&2 <<_eof
   hostname: $HOSTNAME
       arch: $ARCH
        ram: $RAM MiB
       disk: $DISK GiB

+      wipe: $WIPE

    console: $CONSOLE
    console: $CONSOLE

+   restart: $RESTART

 net bridge: $BRIDGE
 net bridge: $BRIDGE

+macaddress: $MAC

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


@@ -142,14 +171,22 @@ fi
 
 echo >&2
 
 
 echo >&2
 

-set -v

 virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
 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 \
 
 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 \

-  -w bridge=$BRIDGE \
+  --network bridge=$BRIDGE,mac=$MAC \

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


@@ -157,9 +194,12 @@ 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 \

-  --prompt --noautoconsole --autostart \
+  --noautoconsole --autostart \

   --extra-args="$extra_args" \
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME
   --extra-args="$extra_args" \
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME

-virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
+
+if [ $RESTART = 1]; then
+  virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
+fi