Revert "Patch for bubblewrap backend"

This reverts commit 08b699b0f026078424d846f74f037b5ed9ee464e.

since it appears to break some builds eg
https://gitlab.com/baserock/definitions/builds/5554760

"RuntimeError: ['mount', '-t', '', '-o', '', '/dev', '/dev']
failed: mount: unknown filesystem type ''"

2 files changed, 2 insertions, 6 deletions

diff --git a/ybd/app.py b/ybd/app.py
index a460a42..51dc2d9 100644
--- a/ybd/app.py
+++ b/ybd/app.py
@@ -34,8 +34,6 @@ try:
 except ImportError:
     riemann_available = False
 
-import sandbox
-import sandboxlib
 
 config = {}
 defs = {}
@@ -162,9 +160,7 @@ def setup(args, original_cwd=""):
         os.path.join(os.path.dirname(__file__), '..', 'ybd.conf'),
         os.path.join(os.path.dirname(__file__), 'config', 'ybd.conf')])
 
-    # chroot and linux_user_chroot both need to be run as root
-    if sandbox.executor in [sandboxlib.chroot, sandboxlib.linux_user_chroot] \
-            and not os.geteuid() == 0 and config.get('mode') == 'normal':
+    if not os.geteuid() == 0 and config.get('mode') == 'normal':
         log('SETUP', '%s needs root permissions' % sys.argv[0], exit=True)
 
     if config.get('kbas-url', 'http://foo.bar/') == 'http://foo.bar/':
diff --git a/ybd/sandbox.py b/ybd/sandbox.py
index fa700f7..cfaed2d 100644
--- a/ybd/sandbox.py
+++ b/ybd/sandbox.py
@@ -123,7 +123,7 @@ def run_sandboxed(dn, command, env=None, allow_parallel=False):
             filesystem_root='/',
             filesystem_writable_paths=writable_paths,
             mounts='isolated',
-            extra_mounts=[('/dev', '/dev', None)],
+            extra_mounts=[],
             network='isolated',
         )
     else: