We want to allow builds in chroots that lack /bin/sh.  Thus, system(3)
and popen(3) need to be tweaked to use the right shell.  For the bootstrap
glibc, we just use whatever `sh' can be found in $PATH.  The final glibc
instead uses the hard-coded absolute file name of `bash'.

--- a/sysdeps/posix/system.c
+++ b/sysdeps/posix/system.c
@@ -106,8 +106,8 @@ do_system (const char *line)
       (void) UNBLOCK;
 
       /* Exec the shell.  */
-      (void) __execve (SHELL_PATH, (char *const *) new_argv, __environ);
+      (void) execvp (SHELL_NAME, (char *const *) new_argv);
       _exit (127);
     }
   else if (pid < (pid_t) 0)
     /* The fork failed.  */
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -170,7 +170,7 @@ _IO_new_proc_open (fp, command, mode)
       for (p = proc_file_chain; p; p = p->next)
 	_IO_close (_IO_fileno ((_IO_FILE *) p));
 
-      _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0);
+      execlp ("sh", "sh", "-c", command, (char *) 0);
       _IO__exit (127);
     }
   _IO_close (child_end);


><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=ae42b55d859d9df6e6ae6c7cc0688d083503c291'>refs</a><a class='active' href='/guix/log/tests/guix-environment-container.sh'>log</a><a href='/guix/tree/tests/guix-environment-container.sh?id=ae42b55d859d9df6e6ae6c7cc0688d083503c291'>tree</a><a href='/guix/commit/tests/guix-environment-container.sh?id=ae42b55d859d9df6e6ae6c7cc0688d083503c291'>commit</a><a href='/guix/diff/tests/guix-environment-container.sh?id=ae42b55d859d9df6e6ae6c7cc0688d083503c291'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-environment-container.sh'>
<input type='hidden' name='id' value='ae42b55d859d9df6e6ae6c7cc0688d083503c291'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=ae42b55d859d9df6e6ae6c7cc0688d083503c291'>root</a>/<a href='/guix/log/tests?id=ae42b55d859d9df6e6ae6c7cc0688d083503c291'>tests</a>/<a href='/guix/log/tests/guix-environment-container.sh?id=ae42b55d859d9df6e6ae6c7cc0688d083503c291'>guix-environment-container.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-environment-container.sh?id=ae42b55d859d9df6e6ae6c7cc0688d083503c291&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-10-28 01:30:37 +0200'>2023-10-28</span></td><td><a href='/guix/commit/tests/guix-environment-container.sh?id=ff1146fb4f7254a8f644f89d7af6b4b566528603'>tests: Adjust to cope with glibc graft.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 1328c4cca531318e3ed90c6aecb522a5b22a4bcc, which
led to failures for tests that were not prepared to cope with that.

* tests/guix-environment-container.sh (hello_drv_nested): Pass “-E
GUIX_BUILD_OPTIONS” so ‘--no-grafts’ is passed.
* tests/guix-pack.sh (GUIX_BUILD_OPTIONS): Add ‘--no-grafts’.
* tests/transformations.scm ("options-&gt;transformation, with-graft"):
Skip when ‘glibc-final’ has a replacement.

Change-Id: Ia65c9aeb06f524252815b8290a5ca7bf97ee8136
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-04-21 16:16:38 +0200'>2023-04-21</span></td><td><a href='/guix/commit/tests/guix-environment-container.sh?id=37dd69b44511dc73eb04bdebe8d82c9a0386338e'>tests: Fix checks for expected failures.</a><span class='msg-avail'>...<span class='msg-tooltip'>Addresses &lt;https://issues.guix.gnu.org/62406&gt;.

With 'set -e', a return status inverted with '!' does not cause the shell to
exit immediately.  Instead use '&amp;&amp; false' to indicate an expected failure.

* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-environment-container.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh,
tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with
'... &amp;&amp; false' or `test ! ...` as appropriate.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2023-04-06 18:34:15 +0200'>2023-04-06</span></td><td><a href='/guix/commit/tests/guix-environment-container.sh?id=57db09aae73e3713a10c5253758d84e1046f80dc'>environment: Add '--nesting'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/environment.scm (show-environment-options-help)
(%options): Add '--nesting'.
(options/resolve-packages): Handle it.
(launch-environment/container): Add #:nesting? and honor it.
[nesting-mappings]: New procedure.
(guix-environment*): Add support for '--nesting'.
* guix/scripts/shell.scm (profile-cached-gc-root): Special-case
'nesting?'.
* tests/guix-environment-container.sh: Test it.
* doc/guix.texi (Invoking guix shell): Document it.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-01-15 17:54:14 -0500'>2023-01-15</span></td><td><a href='/guix/commit/tests/guix-environment-container.sh?id=3bfbfa2946aebb7f68c8027ae80f272f6915c94f'>environment: Fix '--emulate-fhs' option overriding $PATH.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/60566&gt; where even if "--preserve='^PATH$'"
was passed to 'guix shell' it would be replaced by just the FHS directories
when '--emulate-fhs' was also set.

* gnu/scripts/environment.scm (launch-environment): Add the FHS directories to
$PATH rather than overriding $PATH completely.
* tests/guix-environment-container.sh: Test that FHS directories are in $PATH
in the container and that $PATH can be preserved.

Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>John Kehayias</td></tr>