56b1ad3d0d
This corresponds to https://github.com/msys2/msys2-runtime/pull/304 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From 324c53b3ddfec4c546384f7a0ddba5f72214700a Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Fri, 5 Jun 2020 20:09:11 +0200
|
|
Subject: [PATCH 21/N] popen: call /usr/bin/sh instead of /bin/sh
|
|
|
|
We mount /usr/bin to /bin, but in a chroot this is broken and we
|
|
have no /bin, so try to use the real path.
|
|
|
|
chroot is used by pacman to run install scripts when called with --root
|
|
and this broke programs in install scripts calling popen()
|
|
(install-info from texinfo for example)
|
|
|
|
There are more paths hardcoded to /bin in cygwin which might also be broken
|
|
in this scenario, so this maybe should be extended to all of them.
|
|
---
|
|
winsup/cygwin/syscalls.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
|
|
index affaa0d..76b37d6 100644
|
|
--- a/winsup/cygwin/syscalls.cc
|
|
+++ b/winsup/cygwin/syscalls.cc
|
|
@@ -4535,7 +4535,7 @@ popen (const char *command, const char *in_type)
|
|
fcntl (stdchild, F_SETFD, stdchild_state | FD_CLOEXEC);
|
|
|
|
/* Start a shell process to run the given command without forking. */
|
|
- pid_t pid = ch_spawn.worker ("/bin/sh", argv, environ, _P_NOWAIT,
|
|
+ pid_t pid = ch_spawn.worker ("/usr/bin/sh", argv, environ, _P_NOWAIT,
|
|
__std[0], __std[1]);
|
|
|
|
/* Reinstate the close-on-exec state */
|