live-bootstrap

commit: b76871a339661c6b0693c2920eefb89df559814f
parent 31caabdeef3b54aaac351ef5c1782b28cae229ac
Author: fosslinux <fosslinux@aussies.space>
Date:   Tue,  4 May 2021 21:06:10 +1000

Merge pull request #111 from stikonas/chroot

Do not require chroot to be in PATH of non-root user.
Diffstat:
M
lib/utils.py
2
+-
M
rootfs.py
8
+++++++-

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git 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
@@ -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: