=== modified file 'sbin/container_sysroot_run'
--- old/sbin/container_sysroot_run	2021-12-16 15:54:45 +0000
+++ new/sbin/container_sysroot_run	2021-12-16 14:52:24 +0000
@@ -39,7 +39,6 @@
 #  NS_EXTRA="if { mount -o bind,ro /etc/passwd etc/passwd } if { mount -o bind,ro /etc/group etc/group }"
 
 emptyenv -c
-export NS_NO_PID1 1
 pidns_run
 ns_run data/root
 /mnt/ns/bin/s6-applyuidgid -U

=== modified file 'sbin/pidns_run'
--- old/sbin/pidns_run	2021-12-16 15:54:45 +0000
+++ new/sbin/pidns_run	2021-12-16 15:44:26 +0000
@@ -43,11 +43,13 @@
         fork2_pid = os.fork()
         if fork2_pid == 0:
             # child
+            env = dict(os.environ)
+            env['NS_NO_PID1'] = "1"
             if argv[1][0] == '/':
-                os.execv(argv[1], argv[1:])
+                os.execve(argv[1], argv[1:], env)
             for d in os.environ['PATH'].split(':'):
                 try:
-                    os.execv(os.path.join(d, argv[1]), argv[1:])
+                    os.execve(os.path.join(d, argv[1]), argv[1:], env)
                 except FileNotFoundError:
                     continue
             raise SystemExit(127)