[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/30: daemon: Do not use clone on the Hurd.
From: |
guix-commits |
Subject: |
20/30: daemon: Do not use clone on the Hurd. |
Date: |
Sat, 21 Mar 2020 19:36:29 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 71ac98bae5762eed6d54063c7fe96c201208e3cf
Author: Manolis Ragkousis <address@hidden>
AuthorDate: Sun Aug 7 17:48:30 2016 +0300
daemon: Do not use clone on the Hurd.
Checking for CLONE_NEWNS is only needed for using tha Linux specific
clone(2),
otherwise we can use fork(2). Using clone on the Hurd needs some work, only
support LINUX for now. See
https://lists.gnu.org/archive/html/guix-devel/2020-03/msg00190.html
* nix/libstore/build.cc (CHROOT_ENABLED): Break into CHROOT_ENABLED
and CLONE_ENABLED.
(DerivationGoal::startBuilder): Replace CHROOT_ENABLED with __linux__.
(DerivationGoal::runChild): Only define pivot_root() if SYS_pivot_root is
defined.
Co-authored-by: Jan Nieuwenhuizen <address@hidden>
---
nix/libstore/build.cc | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 17e92c6..29266f1 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -52,7 +52,12 @@
#endif
-#define CHROOT_ENABLED HAVE_CHROOT && HAVE_SYS_MOUNT_H && defined(MS_BIND) &&
defined(MS_PRIVATE) && defined(CLONE_NEWNS) && defined(SYS_pivot_root)
+#define CHROOT_ENABLED HAVE_CHROOT && HAVE_SYS_MOUNT_H && defined(MS_BIND) &&
defined(MS_PRIVATE)
+#define CLONE_ENABLED defined(CLONE_NEWNS)
+
+#if defined(SYS_pivot_root)
+#define pivot_root(new_root, put_old) (syscall(SYS_pivot_root,
new_root,put_old))
+#endif
#if CHROOT_ENABLED
#include <sys/socket.h>
@@ -2005,7 +2010,7 @@ void DerivationGoal::startBuilder()
- The UTS namespace ensures that builders see a hostname of
localhost rather than the actual hostname.
*/
-#if CHROOT_ENABLED
+#if __linux__
if (useChroot) {
char stack[32 * 1024];
int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS |
SIGCHLD;
@@ -2186,10 +2191,8 @@ void DerivationGoal::runChild()
if (mkdir("real-root", 0) == -1)
throw SysError("cannot create real-root directory");
-#define pivot_root(new_root, put_old) (syscall(SYS_pivot_root, new_root,
put_old))
if (pivot_root(".", "real-root") == -1)
throw SysError(format("cannot pivot old root directory onto
'%1%'") % (chrootRootDir + "/real-root"));
-#undef pivot_root
if (chroot(".") == -1)
throw SysError(format("cannot change root directory to '%1%'")
% chrootRootDir);
- 04/30: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., (continued)
- 04/30: gnu: glibc: Add signal SA_SIGINFO support for the Hurd., guix-commits, 2020/03/21
- 15/30: gnu: commencement: glibc-intermediate: Build fixes for the Hurd., guix-commits, 2020/03/21
- 03/30: gnu: glibc: Add clock patches for the Hurd., guix-commits, 2020/03/21
- 12/30: gnu: commencement: gnumach-headers-boot0: Build from tarball., guix-commits, 2020/03/21
- 06/30: Revert "gnu: guile-static-stripped: Update to 2.2.", guix-commits, 2020/03/21
- 14/30: gnu: commencement: hurd-minimal-boot0: Build from tarball., guix-commits, 2020/03/21
- 13/30: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/21
- 16/30: gnu: commencement: hurd-source: Update to latest git., guix-commits, 2020/03/21
- 17/30: gnu: commencement: gnumach-headers-boot0: Update to 1.8-116-g28b53508., guix-commits, 2020/03/21
- 18/30: gnu: commencement: glibc-final: Allow gnumach-headers references., guix-commits, 2020/03/21
- 20/30: daemon: Do not use clone on the Hurd.,
guix-commits <=
- 22/30: gnu: less: Build fix for the Hurd., guix-commits, 2020/03/21
- 24/30: gnu: shadow: Add linux-pam dependency for the Hurd., guix-commits, 2020/03/21
- 26/30: gnu: shepherd: Build fix for the Hurd., guix-commits, 2020/03/21
- 09/30: gnu: bootstrap: Add support for the Hurd., guix-commits, 2020/03/21
- 19/30: gnu: hurd: Update to hurd-headers version: 0.9-91a51672., guix-commits, 2020/03/21
- 21/30: daemon: Avoid kill -1 bug on the Hurd., guix-commits, 2020/03/21
- 23/30: gnu: fontconfig: Build fix for the Hurd., guix-commits, 2020/03/21
- 25/30: gnu: pciutils: Build fixes for the Hurd., guix-commits, 2020/03/21
- 28/30: gnu: screen: Build fix for the Hurd., guix-commits, 2020/03/21
- 29/30: gnu: shadow: Build fix for the Hurd., guix-commits, 2020/03/21