X-Git-Url: https://git.madduck.net/code/vinst.git/blobdiff_plain/3f34df1b2d831f855b18496f264ca233b45ca588..9a7aa718329727e694b2d48fb0061dfd803ca846:/vinst

diff --git a/vinst b/vinst
index 02fcef1..bf0a14d 100755
--- a/vinst
+++ b/vinst
@@ -11,6 +11,7 @@ SUITE=wheezy
 CONSOLE='console=tty0 console=ttyS0,115200n8'
 DEBUG=0
 WIPE=0
+RESTART=0
 
 while [ -n "$1" ]; do
   case "$1" in
@@ -72,11 +73,19 @@ while [ -n "$1" ]; do
     (-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"
       ;;
+    (-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
@@ -84,6 +93,9 @@ while [ -n "$1" ]; do
     (--wipe)
       WIPE=1
       ;;
+    (--console)
+      RESTART=1
+      ;;
   esac
   shift
 done
@@ -128,6 +140,11 @@ if [ -z "$ARCH" ]; then
   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
@@ -135,7 +152,9 @@ cat >&2 <<_eof
       disk: $DISK GiB
       wipe: $WIPE
    console: $CONSOLE
+   restart: $RESTART
 net bridge: $BRIDGE
+macaddress: $MAC
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
@@ -167,7 +186,7 @@ virt-install --connect=$QEMU_URI \
   -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 \
@@ -180,4 +199,7 @@ virt-install --connect=$QEMU_URI \
   "$@"
 
 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