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

Merge pull request #240 from nanonyme/separate-sandboxes

Browse source 
Split sysa and sysc when using bwrap
This commit is contained in:
Andrius Štikonas 2023-02-08 01:38:19 +00:00 • committed by GitHub
commit c38b8b3455
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rootfs.py
View file

@ -31,7 +31,7 @@ def create_configuration_file(args):
with open(config_path, "w", encoding="utf_8") as config: with open(config_path, "w", encoding="utf_8") as config:
config.write("FORCE_TIMESTAMPS=" + str(args.force_timestamps) + "\n") config.write("FORCE_TIMESTAMPS=" + str(args.force_timestamps) + "\n")
config.write("CHROOT=" + str(args.chroot or args.bwrap) + "\n") config.write("CHROOT=" + str(args.chroot or args.bwrap) + "\n")
config.write("CHROOT_ONLY_SYSA=False\n") config.write("CHROOT_ONLY_SYSA=" + str(args.bwrap) + "\n")
config.write("UPDATE_CHECKSUMS=" + str(args.update_checksums) + "\n") config.write("UPDATE_CHECKSUMS=" + str(args.update_checksums) + "\n")
config.write("DISK=sda1\n") config.write("DISK=sda1\n")
@ -171,7 +171,6 @@ print(shutil.which('chroot'))
run('bwrap', '--unshare-user', run('bwrap', '--unshare-user',
'--uid', '0', '--uid', '0',
'--gid', '0', '--gid', '0',
'--cap-add', 'CAP_SYS_CHROOT', # Required for chroot from sysa to sysc
'--clearenv', '--clearenv',
'--setenv', 'PATH', '/usr/bin', '--setenv', 'PATH', '/usr/bin',
'--bind', system_a.tmp_dir, '/', '--bind', system_a.tmp_dir, '/',
@ -180,17 +179,25 @@ print(shutil.which('chroot'))
'--dev-bind', '/dev/zero', '/dev/zero', '--dev-bind', '/dev/zero', '/dev/zero',
'--dev-bind', '/dev/random', '/dev/random', '--dev-bind', '/dev/random', '/dev/random',
'--dev-bind', '/dev/urandom', '/dev/urandom', '--dev-bind', '/dev/urandom', '/dev/urandom',
'--dir', '/sysc_image/dev',
'--dev-bind', '/dev/null', '/sysc_image/dev/null',
'--dev-bind', '/dev/zero', '/sysc_image/dev/zero',
'--dev-bind', '/dev/random', '/sysc_image/dev/random',
'--dev-bind', '/dev/urandom', '/sysc_image/dev/urandom',
'--tmpfs', '/sysc_image/dev/shm',
'--proc', '/sysc_image/proc',
'--bind', '/sys', '/sysc_image/sys',
'--tmpfs', '/sysc_image/tmp',
init) init)
run('bwrap', '--unshare-user',
'--uid', '0',
'--gid', '0',
'--clearenv',
'--setenv', 'PATH', '/usr/bin',
'--bind', system_a.tmp_dir + "/sysc_image", '/',
'--dir', '/dev',
'--dev-bind', '/dev/null', '/dev/null',
'--dev-bind', '/dev/zero', '/dev/zero',
'--dev-bind', '/dev/random', '/dev/random',
'--dev-bind', '/dev/urandom', '/dev/urandom',
'--tmpfs', '/dev/shm',
'--proc', '/proc',
'--bind', '/sys', '/sys',
'--tmpfs', '/tmp',
'/init')
elif args.bare_metal: elif args.bare_metal:
system_c.prepare(create_disk_image=True) system_c.prepare(create_disk_image=True)
system_a.prepare(create_initramfs=True) system_a.prepare(create_initramfs=True)