Change: make x220.sh take branches for v-i and vmdb2

Also, run vmdb2 from a git clone instead of installed.

Change: force both v-i and vmdb2 branches to be given to x220.sh

1 files changed, 11 insertions, 2 deletions

diff --git a/x220.sh b/x220.sh
index 76ba380..7059ef1 100755
--- a/x220.sh
+++ b/x220.sh
@@ -2,11 +2,20 @@
 
 set -eux
 
-git clone git://git.liw.fi/v-i
+vi="$1"
+vmdb2="$2"
+
+git clone -b "$vi" git://git.liw.fi/v-i
+git clone -b "$vmdb2" git://git.liw.fi/vmdb2
 git clone git://git.liw.fi/ansibleness
 git clone git://git.liw.fi/debian-ansible
 
 cd v-i
 export ANSIBLE_LOG=/root/ansible.log
 export ANSIBLE_ROLES_PATH=/root/debian-ansible/roles:/root/ansibleness/ansible/roles
-vmdb2 --image /dev/sda x220.vmdb --verbose  --rootfs-tarball /root/rootfs.tar.gz
+/root/vmdb2/vmdb2 \
+    --verbose \
+    --rootfs-tarball /root/rootfs.tar.gz \
+    --log /root/x220.log \
+    --image /dev/sda \
+    x220.vmdb