diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2016-10-26 16:05:19 +0100 |
|---|---|---|
| committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2016-10-26 16:05:19 +0100 |
| commit | 03e707812e6ce8a66980a8744a2e60ecebfd176d (patch) | |
| tree | 7959600aa389e24a19328b68603d88549c91d456 /ybd/app.py | |
| parent | 2b320b8b82f38f1c686a888b4242b77bc5b8ceb2 (diff) | |
| download | ybd-03e707812e6ce8a66980a8744a2e60ecebfd176d.tar.gz | |
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 ''"
Diffstat (limited to 'ybd/app.py')
| -rw-r--r-- | ybd/app.py | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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/': |