From 98c4cf34bb0326f59102820fa6a314d7414b5f3e Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Thu, 25 Dec 2014 20:29:25 +0200
Subject: Clean up for creating VMs under jessie

---
 vm-data/common.conf       | 2 ++
 vm-data/jenkins.conf      | 8 ++++----
 vm-data/sid-amd64.conf    | 6 +++---
 vm-data/sid-i386.conf     | 6 +++---
 vm-data/wheezy-amd64.conf | 6 +++---
 vm-data/wheezy-i386.conf  | 5 +++--
 vm-data/worker.customize  | 6 ++++++
 7 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/vm-data/common.conf b/vm-data/common.conf
index 756c73e..7d01096 100644
--- a/vm-data/common.conf
+++ b/vm-data/common.conf
@@ -4,3 +4,5 @@ mirror = http://192.168.122.1/debian
 enable-dhcp = yes
 size = 8G
 verbose = yes
+grub = yes
+sparse = yes
diff --git a/vm-data/jenkins.conf b/vm-data/jenkins.conf
index 6986c75..94d13fb 100644
--- a/vm-data/jenkins.conf
+++ b/vm-data/jenkins.conf
@@ -1,8 +1,8 @@
 [config]
-distribution = wheezy
+distribution = jessie
 hostname = jenkins
 arch = amd64
-image = jenkins.img
 customize = vm-data/jenkins.customize
-package = acpid, acpi-support-base, bzr, git, ssh, vim, less, rsync, apache2, reprepro, sudo, graphviz, python-coverage, default-jre-headless, python-bottle
-
+package = acpid, acpi-support-base, bzr, git, ssh, vim, less, rsync,
+        apache2, reprepro, sudo, graphviz, python-coverage,
+        default-jre-headless, python-bottle
diff --git a/vm-data/sid-amd64.conf b/vm-data/sid-amd64.conf
index 2680407..ed145fb 100644
--- a/vm-data/sid-amd64.conf
+++ b/vm-data/sid-amd64.conf
@@ -2,7 +2,7 @@
 arch = amd64
 distribution = sid
 hostname = jenkins-sid-amd64
-image = jenkins-sid-amd64.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle, systemd-sysv
-
+package = acpid, acpi-support-base, build-essential, bzr, git,
+        debhelper, devscripts, ssh, vim, less, rsync, pbuilder,
+        fakeroot, dput, sudo, python-bottle, systemd-sysv
diff --git a/vm-data/sid-i386.conf b/vm-data/sid-i386.conf
index 707bd67..7efa1aa 100644
--- a/vm-data/sid-i386.conf
+++ b/vm-data/sid-i386.conf
@@ -2,7 +2,7 @@
 arch = i386
 distribution = sid
 hostname = jenkins-sid-i386
-image = jenkins-sid-i386.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle, systemd-sysv
-
+package = acpid, acpi-support-base, build-essential, bzr, git, debhelper,
+        devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo,
+        python-bottle, systemd-sysv
diff --git a/vm-data/wheezy-amd64.conf b/vm-data/wheezy-amd64.conf
index 9ec5ae6..a274a44 100644
--- a/vm-data/wheezy-amd64.conf
+++ b/vm-data/wheezy-amd64.conf
@@ -2,7 +2,7 @@
 arch = amd64
 distribution = wheezy
 hostname = jenkins-wheezy-amd64
-image = jenkins-wheezy-amd64.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle
-
+package = acpid, acpi-support-base, build-essential, bzr, git, debhelper,
+        devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo,
+        python-bottle
diff --git a/vm-data/wheezy-i386.conf b/vm-data/wheezy-i386.conf
index 45e5661..5efe0a8 100644
--- a/vm-data/wheezy-i386.conf
+++ b/vm-data/wheezy-i386.conf
@@ -2,6 +2,7 @@
 arch = i386
 distribution = wheezy
 hostname = jenkins-wheezy-i386
-image = jenkins-wheezy-i386.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle
+package = acpid, acpi-support-base, build-essential, bzr, git, debhelper,
+        devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo,
+        python-bottle
diff --git a/vm-data/worker.customize b/vm-data/worker.customize
index cf81daa..56ce661 100755
--- a/vm-data/worker.customize
+++ b/vm-data/worker.customize
@@ -71,3 +71,9 @@ EOF
 
 # Append addresses to /etc/hosts.
 cat vm-data/hosts >> "$rootdir/etc/hosts"
+
+# Force loading of the fuse kernel module.
+echo fuse >> "$rootdir/etc/modules"
+
+# Add the jenkins user to the fuse group.
+chroot "$rootdir" adduser jenkins fuse
-- 
cgit v1.2.1