andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace --clearenv with env - to support older bwrap 

This makes bwrap work on Debian 10.
This commit is contained in:
Gábor Stefanik 2023-12-25 10:21:49 +01:00 committed by fosslinux
parent 97f31072ce
commit 2c6ac94974
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rootfs.py
View File

@ -191,11 +191,10 @@ print(shutil.which('chroot'))
arch = stage0_arch_map.get(args.arch, args.arch)
init = os.path.join(os.sep, 'bootstrap-seeds', 'POSIX', arch, 'kaem-optional-seed')
run('bwrap', '--unshare-user',
run('env', '-', 'bwrap', '--unshare-user',
'--uid', '0',
'--gid', '0',
'--unshare-net' if args.external_sources else None,
'--clearenv',
'--setenv', 'PATH', '/usr/bin',
'--bind', generator.tmp_dir, '/',
'--dir', '/dev',
@ -213,11 +212,10 @@ print(shutil.which('chroot'))
if args.internal_ci in ("pass2", "pass3"):
generator.reuse(tmpdir)
run('bwrap', '--unshare-user',
run('env', '-', 'bwrap', '--unshare-user',
'--uid', '0',
'--gid', '0',
'--unshare-net' if args.external_sources else None,
'--clearenv',
'--setenv', 'PATH', '/usr/bin',
'--bind', generator.tmp_dir, '/',
'--dir', '/dev',