diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-28 16:14:29 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-28 16:14:29 +0000 |
| commit | 698a77d97c534c2a7180bfa21aba4d6446d56ebc (patch) | |
| tree | f453f3738e8bc839f00f23ebce844ea57639deaf /sandboxlib/linux_user_chroot.py | |
| parent | d9fc911053945a77a994116d5ac1bbe4f3b67100 (diff) | |
| download | sandboxlib-698a77d97c534c2a7180bfa21aba4d6446d56ebc.tar.gz | |
Don't have a 'base' environment, make the caller specify 'env'
The idea with 'extra_env' was that all 'sandboxlib' sandboxes would have
a consistent base environment with standard PATH, etc. But that's not
really workable at all, and only PATH actually matters here anyway.
Now the caller passes in the entire environment as 'env', 'extra_env' is
gone.
Diffstat (limited to 'sandboxlib/linux_user_chroot.py')
| -rw-r--r-- | sandboxlib/linux_user_chroot.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sandboxlib/linux_user_chroot.py b/sandboxlib/linux_user_chroot.py index 4244d99..cca734f 100644 --- a/sandboxlib/linux_user_chroot.py +++ b/sandboxlib/linux_user_chroot.py @@ -259,7 +259,7 @@ def process_writable_paths(fs_root, writable_paths): return extra_linux_user_chroot_args -def run_sandbox(command, cwd=None, extra_env=None, +def run_sandbox(command, cwd=None, env=None, filesystem_root='/', filesystem_writable_paths='all', mounts='undefined', extra_mounts=None, network='undefined', @@ -282,8 +282,6 @@ def run_sandbox(command, cwd=None, extra_env=None, linux_user_chroot_command.append(filesystem_root) - env = sandboxlib.environment_vars(extra_env) - argv = (unshare_command + linux_user_chroot_command + command) exit, out, err = sandboxlib._run_command(argv, stdout, stderr, env=env) return exit, out, err |