1 files changed, 33 insertions, 9 deletions
diff --git a/x220.sh b/x220.sh
index 7059ef1..9efdf91 100755
--- a/x220.sh
+++ b/x220.sh
@@ -5,17 +5,41 @@ set -eux
 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
+gitget() {
+	local url="$1"
+	local branch="$2"
+	local dir="$3"
+	if [ ! -e "$dir" ]; then
+		git clone -b "$branch" "$url"
+	else
+		(cd "$dir" && git checkout "$branch" && git pull)
+	fi
+}
+
+git config --global pull.ff only
+gitget git://git.liw.fi/v-i "$vi" v-i
+gitget git://git.liw.fi/vmdb2 "$vmdb2" vmdb2
+gitget git://git.liw.fi/ansibleness main ansibleness
+gitget git://git.liw.fi/debian-ansible main debian-ansible
 
 cd v-i
 export ANSIBLE_LOG=/root/ansible.log
 export ANSIBLE_ROLES_PATH=/root/debian-ansible/roles:/root/ansibleness/ansible/roles
+
+if vgdisplay | grep "VG Name" || [ -e /dev/mapper/pv0 ]; then
+	vgremove --force vg0 || true
+	! [ -e /dev/vg0 ]
+
+	pvremove /dev/mapper/pv0 || true
+	cryptsetup close pv0
+
+	dd if=/dev/zero of=/dev/sda bs=1M count=20000 oflag=direct status=progress
+fi
+
+rm -f /root/x220.log
 /root/vmdb2/vmdb2 \
-    --verbose \
-    --rootfs-tarball /root/rootfs.tar.gz \
-    --log /root/x220.log \
-    --image /dev/sda \
-    x220.vmdb
+	--verbose \
+	--rootfs-tarball /root/rootfs.tar.gz \
+	--log /root/x220.log \
+	--image /dev/sda \
+	x220.vmdb