Inherit user id and group id for bst shell

This allows D-Bus access.

Fixes #227

2 files changed, 12 insertions, 1 deletions

diff --git a/buildstream/sandbox/_sandboxbwrap.py b/buildstream/sandbox/_sandboxbwrap.py
index 71fd6951b..cab178f0f 100644
--- a/buildstream/sandbox/_sandboxbwrap.py
+++ b/buildstream/sandbox/_sandboxbwrap.py
@@ -130,7 +130,9 @@ class SandboxBwrap(Sandbox):
 
         # Set UID and GUI
         if self.user_ns_available:
-            bwrap_command += ['--unshare-user', '--uid', '0', '--gid', '0']
+            bwrap_command += ['--unshare-user']
+            if not flags & SandboxFlags.INHERIT_UID:
+                bwrap_command += ['--uid', '0', '--gid', '0']
 
         # Add the command
         bwrap_command += command
diff --git a/buildstream/sandbox/sandbox.py b/buildstream/sandbox/sandbox.py
index bc080e30d..9f0a58628 100644
--- a/buildstream/sandbox/sandbox.py
+++ b/buildstream/sandbox/sandbox.py
@@ -61,6 +61,15 @@ class SandboxFlags():
     the terminal entirely.
     """
 
+    INHERIT_UID = 0x08
+    """Whether to use the user id and group id from the host environment
+
+    This determines if processes in the sandbox should run with the
+    same user id and group id as BuildStream itself. By default,
+    processes run with user id and group id 0, protected by a user
+    namespace where available.
+    """
+
 
 class Sandbox():
     """Sandbox()