]> 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:

final touches
[code/vinst.git] / vinst
diff --git a/vinst b/vinst
index dc0b82b969eacf1d543b3c204dae4ddd090633e0..695ae17f07af6ab7d07f5b5bfbf814b143a0fe5d 100755 (executable)
--- a/vinst
+++ b/vinst
@@ -15,6 +15,17 @@ RESTART=0
 
 while [ -n "$1" ]; do
   case "$1" in
+    (--debug)
+      DEBUG=1
+      ;;
+    (-S|--suite)
+      shift
+      if [ -z "$1" ]; then
+        echo >&2 'E: --suite/-S needs suite argument'
+        exit 1
+      fi
+      SUITE="$1"
+      ;;
     (-n|--name)
       shift
       if [ -z "$1" ]; then
@@ -73,11 +84,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 +104,7 @@ while [ -n "$1" ]; do
     (--wipe)
       WIPE=1
       ;;
-    (--console)
+    (--restart)
       RESTART=1
       ;;
   esac
@@ -102,10 +121,15 @@ BASEDIR=$(cd ${0%/*}; pwd)
 tmpdir=$(mktemp -d)
 tar -C $BASEDIR/preseed/$SUITE -cf $tmpdir/commands.tar commands
 
-extra_args="auto $CONSOLE \
+extra_kargs="auto $CONSOLE \
 hostname=${HOSTNAME%%.*} \
 domain=${HOSTNAME#*.}"
 
+extra_opts=
+if [ -n "$DEBUG" ]; then
+  extra_opts='--debug'
+fi
+
 if [ -n "$IPADDRESS" ]; then
   if [ -z "$GATEWAY" ] && [ -x $(command -v ipcalc) ]; then
     # default to the first IP in the network
@@ -115,7 +139,7 @@ if [ -n "$IPADDRESS" ]; then
   IPADDRESS="${IPADDRESS%/*}"
   : ${NAMESERVER:=$GATEWAY}
 
-  extra_args="$extra_args netcfg/disable_dhcp=true \
+  extra_kargs="$extra_kargs netcfg/disable_dhcp=true \
   netcfg/get_ipaddress=$IPADDRESS \
   netcfg/get_netmask=$NETMASK \
   netcfg/get_gateway=$GATEWAY \
@@ -124,7 +148,7 @@ if [ -n "$IPADDRESS" ]; then
   BRIDGE=wan
 
 else
-  extra_args="$extra_args netcfg/disable_dhcp=false"
+  extra_kargs="$extra_kargs netcfg/disable_dhcp=false"
   BRIDGE=virt-br
 fi
 
@@ -132,15 +156,22 @@ 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
+     suite: $SUITE
        ram: $RAM MiB
       disk: $DISK GiB
       wipe: $WIPE
    console: $CONSOLE
    restart: $RESTART
 net bridge: $BRIDGE
+macaddress: $MAC
 _eof
 if [ -n "$IPADDRESS" ]; then
   cat >&2 <<_eof
@@ -159,6 +190,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,20 +204,20 @@ 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 \
-  --os-variant=debian$SUITE \
-  -l $BASEDIR/installer-amd64 \
+  --os-variant=debianwheezy \
   --initrd-inject=$BASEDIR/preseed/$SUITE/preseed.cfg \
   --initrd-inject=$tmpdir/commands.tar \
-  --noautoconsole --autostart \
-  --extra-args="$extra_args" \
+  --extra-args="$extra_kargs" \
+  --prompt --noautoconsole --autostart $extra_opts \
+  -l $BASEDIR/installer-amd64/$SUITE \
   "$@"
 
 virsh --connect=$QEMU_URI console $HOSTNAME
 
-if [ $RESTART = 1]; then
+if [ $RESTART = 1 ]; then
   virsh --connect=$QEMU_URI "start $HOSTNAME; console $HOSTNAME"
 fi