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);


a><a href='/guix/'>summary</a><a href='/guix/refs/?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>refs</a><a class='active' href='/guix/log/tests/offload.scm'>log</a><a href='/guix/tree/tests/offload.scm?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>tree</a><a href='/guix/commit/tests/offload.scm?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>commit</a><a href='/guix/diff/tests/offload.scm?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/offload.scm'>
<input type='hidden' name='id' value='d21ddfc9d884f045afa6db581e852c525c67ef35'/><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=d21ddfc9d884f045afa6db581e852c525c67ef35'>root</a>/<a href='/guix/log/tests?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>tests</a>/<a href='/guix/log/tests/offload.scm?id=d21ddfc9d884f045afa6db581e852c525c67ef35'>offload.scm</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/offload.scm?id=d21ddfc9d884f045afa6db581e852c525c67ef35&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-08-25 13:45:27 -0400'>2020-08-25</span></td><td><a href='/guix/commit/tests/offload.scm?id=4b5a6fbc9b754c0ca70d033dd99f17c4f028733a'>offload: Modify the build-machine record to accept multiple systems.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/offload.scm (&lt;build-machine&gt;)[systems]: New field.
[system]: Accessor changed to %build-machine-system.  Default to #f.
* guix/scripts/offload.scm (build-machine-system): Wrap %build-machine-system
with a deprecation warning.
(build-machine-systems): Access the new systems field or fallback to use
build-machine-system, for backward compatibility.
(machine-matches?): Adjust.
* tests/offload.scm: Add tests...
* Makefile.am (SCM_TESTS): ...and register them.
* doc/guix.texi (Daemon Offload Setup): Update doc.
</span></span></td><td>Maxim Cournoyer</td></tr>