]> git.madduck.net Git - code/vinst.git/blobdiff - vinst

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

bash syntax fix for restarts
[code/vinst.git] / vinst
diff --git a/vinst b/vinst
index 73d50c418d257c593495da5871bb9678375cc701..6b6ca5dc60ef4009f137f5fcba3ee09e1e70d0f0 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,32 @@ 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"
+      ;;
+    (-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
@@ -107,12 +136,25 @@ else
   BRIDGE=virt-br
 fi
 
   BRIDGE=virt-br
 fi
 
+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
 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
 net bridge: $BRIDGE
+macaddress: $MAC
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
@@ -127,13 +169,25 @@ 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
+  echo >&2 "Wiping disk…"
+  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 \
   -n $HOSTNAME \
   -r $RAM \
-  --disk pool=default,size=$SIZE \
-  -w bridge=$BRIDGE \
+  --disk vol=$STORAGE_POOL/virt-$HOSTNAME \
+  --network bridge=$BRIDGE,mac=$MAC \
   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \
   --graphics=vnc \
   --serial=pty \
   --watchdog i6300esb,action=reset \
@@ -141,6 +195,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