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

Do not require chroot to be in PATH of non-root user.

This commit is contained in:
Andrius Štikonas 2021-04-21 23:54:14 +01:00
parent 31caabdeef
commit 8406399f47
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/utils.py
View File

@ -20,7 +20,7 @@ def run(*args, **kwargs):
print(arguments) print(arguments)
try: try:
subprocess.run(arguments, check=True, **kwargs) return subprocess.run(arguments, check=True, **kwargs)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print("Bootstrapping failed") print("Bootstrapping failed")
sys.exit(1) sys.exit(1)

8
rootfs.py
View File

@ -81,8 +81,14 @@ def bootstrap(args, tmp_dir, initramfs_path):
"""Kick off bootstrap process.""" """Kick off bootstrap process."""
print("Bootstrapping %s" % (args.arch)) print("Bootstrapping %s" % (args.arch))
if args.chroot: if args.chroot:
find_chroot = """
import shutil
print(shutil.which('chroot'))
"""
chroot_binary = run('sudo', 'python3', '-c', find_chroot,
capture_output=True).stdout.decode().strip()
init = os.path.join(os.sep, 'bootstrap-seeds', 'POSIX', args.arch, 'kaem-optional-seed') init = os.path.join(os.sep, 'bootstrap-seeds', 'POSIX', args.arch, 'kaem-optional-seed')
run('sudo', 'env', '-i', 'PATH=/bin', 'chroot', tmp_dir, init) run('sudo', 'env', '-i', 'PATH=/bin', chroot_binary, tmp_dir, init)
return return
if args.minikernel: if args.minikernel: