X-Git-Url: https://git.madduck.net/code/vinst.git/blobdiff_plain/6a3968790b2b2704e57aa4d0e272fb4abbc3d369..49daa40014e07fd1a3edf8d6f2e9f3f69bbe0166:/vinst

diff --git a/vinst b/vinst
index dc0b82b..6b6ca5d 100755
--- a/vinst
+++ b/vinst
@@ -73,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
@@ -85,7 +93,7 @@ while [ -n "$1" ]; do
     (--wipe)
       WIPE=1
       ;;
-    (--console)
+    (--restart)
       RESTART=1
       ;;
   esac
@@ -132,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
@@ -141,6 +154,7 @@ cat >&2 <<_eof
    console: $CONSOLE
    restart: $RESTART
 net bridge: $BRIDGE
+macaddress: $MAC
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
@@ -159,6 +173,7 @@ echo >&2
 
 virsh --connect=$QEMU_URI vol-create-as $STORAGE_POOL virt-$HOSTNAME ${DISK}G
 if [ $WIPE = 1 ]; then
+  echo >&2 "Wiping disk…"
   virsh --connect=$QEMU_URI vol-wipe --pool $STORAGE_POOL --algorithm zero virt-$HOSTNAME
 fi
 
@@ -172,7 +187,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 \
@@ -186,6 +201,6 @@ virt-install --connect=$QEMU_URI \
 
 virsh --connect=$QEMU_URI console $HOSTNAME
 
-if [ $RESTART = 1]; then
+if [ $RESTART = 1 ]; then
   virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
 fi