From 7cbb46458a2f553a2ce25b0868502178d651345e Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 7 Nov 2017 23:10:03 +0100
Subject: [PATCH] tune vm build

---
 vm/README.txt         | 2 +-
 vm/build.sh           | 8 ++++++--
 vm/pandora_install.sh | 6 ++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/vm/README.txt b/vm/README.txt
index 9933ed98..f0ebdbef 100644
--- a/vm/README.txt
+++ b/vm/README.txt
@@ -5,7 +5,7 @@ Create virtual disk of pan.do/ra
 Pan.do/ra VM are based on cloud images.
 You also qemu to run the vm and virtualbox to convert the image
 
-  apt-get install vmdebootstrap virtualbox qemu qemu-utils
+  apt-get install virtualbox qemu qemu-utils
   apt-get install kvm cloud-utils
 
 
diff --git a/vm/build.sh b/vm/build.sh
index a6efeb45..0f2f86bc 100755
--- a/vm/build.sh
+++ b/vm/build.sh
@@ -7,8 +7,12 @@ TARGET=${BASE}/pandora-r${VERSION}.vdi
 
 img=xenial-server-cloudimg-amd64-disk1.img
 
-test -e $img || curl -O https://cloud-images.ubuntu.com/xenial/current/$img
-cp --reflink=always $img ${TARGET}.img
+if [ ! -e $img ]; then
+    echo downloading $img
+    curl -s -O https://cloud-images.ubuntu.com/xenial/current/$img
+fi
+echo preparing ${TARGET}.img
+cp -a $img ${TARGET}.img
 
 cloud-localds seed.img cloud-config
 qemu-img resize ${TARGET}.img +998G
diff --git a/vm/pandora_install.sh b/vm/pandora_install.sh
index 5bb3f717..7fa348a4 100755
--- a/vm/pandora_install.sh
+++ b/vm/pandora_install.sh
@@ -272,4 +272,10 @@ set showmode
 
 set lcs=tab:→·,trail:·,nbsp:˽
 set list
+if has('mouse')
+  set mouse=
+endif
 EOF
+if [ -e /usr/share/vim/vim80/defaults.vim ]; then
+    sed -i 's/ set mouse=a/" set mouse=a/g' /usr/share/vim/vim80/defaults.vim
+fi