live-bootstrap

commit: 2c6ac949746072f0ee4e396a40a58ab09fc39df6
parent 97f31072ce22e381b4fff3f8da74de1a2f5aebbd
Author: Gábor Stefanik <netrolller.3d@gmail.com>
Date:   Mon, 25 Dec 2023 10:21:49 +0100

Replace --clearenv with env - to support older bwrap

This makes bwrap work on Debian 10.

Diffstat:
M
rootfs.py
6
++----

1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/rootfs.py b/rootfs.py
@@ -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',