From bd11fb961c40f4b121c2c24549fb2260e5bc2597 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Thu, 12 Jul 2018 10:17:14 +0200
Subject: [PATCH 1/2] Fix kvm-dependency package

---
 servo-build-dependencies/kvm.sls | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/servo-build-dependencies/kvm.sls b/servo-build-dependencies/kvm.sls
index a4eb83a2..a87051f5 100644
--- a/servo-build-dependencies/kvm.sls
+++ b/servo-build-dependencies/kvm.sls
@@ -1,10 +1,8 @@
 kvm-dependencies:
   pkg.installed:
     - pkgs:
-      # We don’t actually use the contents of this package,
-      # installing it makes /dev/kvm be usable by the 'kvm' Unix group
-      # (and makes that group exist).
-      - libvirt-bin
+      # Also creates the 'kvm' group and gives it permissions to /dev/kvm
+      - qemu-kvm
 
 kvm-group:
   user.present:

From 42bdb4d8349947c4625bf80ecc06449f8ccb6fb3 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Thu, 12 Jul 2018 10:40:17 +0200
Subject: [PATCH 2/2] Install a systemd service file, not upstart, on Ubuntu
 16.04

---
 buildbot/slave/files/buildbot-slave.service | 15 +++++++++++++++
 buildbot/slave/init.sls                     | 18 +++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 buildbot/slave/files/buildbot-slave.service

diff --git a/buildbot/slave/files/buildbot-slave.service b/buildbot/slave/files/buildbot-slave.service
new file mode 100644
index 00000000..e39dcf3b
--- /dev/null
+++ b/buildbot/slave/files/buildbot-slave.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Buildbot Worker
+Wants=network.target
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/local/bin/buildslave start --nodaemon {{ common.servo_home }}/buildbot/slave
+Restart=always
+User=servo
+Group=servo
+Environment="HOME={{ common.servo_home }}"
+
+[Install]
+WantedBy=multi-user.target
diff --git a/buildbot/slave/init.sls b/buildbot/slave/init.sls
index 338d5177..e8a37106 100644
--- a/buildbot/slave/init.sls
+++ b/buildbot/slave/init.sls
@@ -43,7 +43,7 @@ buildbot-slave-dependencies:
     - watch_in:
       - service: buildbot-slave
 
-{% else %}
+{% elif grains['osrelease'] == '14.04' %}
 
 /etc/init/buildbot-slave.conf:
   file.managed:
@@ -59,6 +59,22 @@ buildbot-slave-dependencies:
       - service: buildbot-slave
     {% endif %}
 
+{% else %}
+
+/etc/systemd/system/buildbot-slave.service:
+  file.managed:
+    - source: salt://{{ tpldir }}/files/buildbot-slave.service
+    - user: root
+    - group: root
+    - mode: 644
+    - template: jinja
+    - context:
+        common: {{ common }}
+    {% if grains.get('virtual_subtype', '') != 'Docker' %}
+    - watch_in:
+      - service: buildbot-slave
+    {% endif %}
+
 {% endif %}
 
 {% if grains.get('virtual_subtype', '') != 'Docker' %}