diff --git a/lib/utils.py b/lib/utils.py index ca256dc..4a7e1a2 100755 --- a/lib/utils.py +++ b/lib/utils.py @@ -20,7 +20,7 @@ def run(*args, **kwargs): print(arguments) try: - subprocess.run(arguments, check=True, **kwargs) + return subprocess.run(arguments, check=True, **kwargs) except subprocess.CalledProcessError: print("Bootstrapping failed") sys.exit(1) diff --git a/rootfs.py b/rootfs.py index cb7fc04..4ddc6f2 100755 --- a/rootfs.py +++ b/rootfs.py @@ -81,8 +81,14 @@ def bootstrap(args, tmp_dir, initramfs_path): """Kick off bootstrap process.""" print("Bootstrapping %s" % (args.arch)) 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') - run('sudo', 'env', '-i', 'PATH=/bin', 'chroot', tmp_dir, init) + run('sudo', 'env', '-i', 'PATH=/bin', chroot_binary, tmp_dir, init) return if args.minikernel: