kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-02 01:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #279 from eduardosm/external-sources-without-net

Browse source 
Pass `--unshare-net` to bwrap when building with `--external-sources`
This commit is contained in:
fosslinux 2023-04-14 02:05:48 +00:00 • committed by GitHub
commit b0a2747ada
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/utils.py
View file

@ -14,7 +14,7 @@ import sys
def run(*args, **kwargs): def run(*args, **kwargs):
"""A small wrapper around subprocess.run""" """A small wrapper around subprocess.run"""
arguments = [str(arg) for arg in args] arguments = [str(arg) for arg in args if arg is not None]
if kwargs.pop('verbose', False): if kwargs.pop('verbose', False):
print(arguments) print(arguments)

2
rootfs.py
View file

@ -181,6 +181,7 @@ print(shutil.which('chroot'))
run('bwrap', '--unshare-user', run('bwrap', '--unshare-user',
'--uid', '0', '--uid', '0',
'--gid', '0', '--gid', '0',
'--unshare-net',
'--clearenv', '--clearenv',
'--setenv', 'PATH', '/usr/bin', '--setenv', 'PATH', '/usr/bin',
'--bind', system_a.tmp_dir, '/', '--bind', system_a.tmp_dir, '/',
@ -194,6 +195,7 @@ print(shutil.which('chroot'))
run('bwrap', '--unshare-user', run('bwrap', '--unshare-user',
'--uid', '0', '--uid', '0',
'--gid', '0', '--gid', '0',
'--unshare-net' if args.external_sources else None,
'--clearenv', '--clearenv',
'--setenv', 'PATH', '/usr/bin', '--setenv', 'PATH', '/usr/bin',
'--bind', system_a.tmp_dir + "/sysc_image", '/', '--bind', system_a.tmp_dir + "/sysc_image", '/',