From 9fdb0d1b1af95dd52143115411544d68a1ed5658 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 27 Jan 2018 10:47:39 +0200
Subject: Change: bind mount workspace as /workspace in containers

---
 worker_manager | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'worker_manager')

diff --git a/worker_manager b/worker_manager
index da7b23d..515f41a 100755
--- a/worker_manager
+++ b/worker_manager
@@ -391,9 +391,13 @@ class WorkerBase:
             argv = ['sudo', 'chroot', self._workspace] + argv
         elif self.where(work) == 'container':
             logging.debug('CONTAINER REQUESTED')
+            bind = '{}:/workspace'.format(self._workspace)
+            mp = '{}/workspace'.format(self._workspace)
+            if not os.path.exists(mp):
+                os.mkdir(mp)
             argv = [
-                'sudo', 'systemd-nspawn', '-D', self._systree,
-                '--bind', self._workspace,
+                'sudo', 'systemd-nspawn', '-D', self._systree, '--bind', bind,
+                '--chdir', '/workspace',
             ] + argv
         else:
             logging.debug('HOST REQUESTED')
-- 
cgit v1.2.1