From 6e63e03b86916c697e411b9f382f98a4834779ff Mon Sep 17 00:00:00 2001 From: jvoisin Date: Sat, 9 Feb 2019 15:23:16 +0100 Subject: [PATCH] Streamline a bit the previous commit --- libmat2/subprocess.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libmat2/subprocess.py b/libmat2/subprocess.py index e9c66d9..cf24176 100644 --- a/libmat2/subprocess.py +++ b/libmat2/subprocess.py @@ -32,22 +32,26 @@ def _get_bwrap_path() -> str: def _get_bwrap_args(tempdir: str, input_filename: str, output_filename: Optional[str] = None) -> List[str]: + ro_bind_args = [] cwd = os.getcwd() # XXX: use --ro-bind-try once all supported platforms # have a bubblewrap recent enough to support it. ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', cwd] - ro_bind_args = [] for bind_dir in ro_bind_dirs: if os.path.isdir(bind_dir): # pragma: no cover ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) + ro_bind_files = ['/etc/ld.so.cache'] + for bind_file in ro_bind_files: + if os.path.isfile(bind_file): # pragma: no cover + ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) + args = ro_bind_args + \ ['--dev', '/dev', '--chdir', cwd, '--unshare-all', '--new-session', - '--ro-bind', '/etc/ld.so.cache', '/etc/ld.so.cache', # XXX: enable --die-with-parent once all supported platforms have # a bubblewrap recent enough to support it. # '--die-with-parent',