diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-12-12T13·41+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-12-12T13·41+0000 |
| commit | 2b70a8e7c98adebdac1e546e17ee1d909b4e5989 (patch) | |
| tree | 31c8433c046a205719d462e3d40641914a7a1ac8 | |
| parent | 9122dcecbba9d5268d1087918ffe5a3b970625b8 (diff) | |
* Detect whether unshare() is available.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/libstore/build.cc | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 7b8c36f1e8ef..d5e858123ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,7 @@ AC_LANG_POP(C++) # Check for chroot support (requires chroot() and bind mounts). AC_CHECK_FUNCS([chroot]) +AC_CHECK_FUNCS([unshare]) AC_CHECK_HEADERS([sched.h], [], [], []) AC_CHECK_HEADERS([sys/param.h], [], [], []) AC_CHECK_HEADERS([sys/mount.h], [], [], diff --git a/src/libstore/build.cc b/src/libstore/build.cc index d4c5b81d3f50..8d06a66f6094 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -34,13 +34,10 @@ #include <sys/mount.h> #endif #if HAVE_SCHED_H -#if !defined _GNU_SOURCE -#define _GNU_SOURCE -#endif #include <sched.h> #endif -#define CHROOT_ENABLED HAVE_CHROOT && HAVE_SYS_MOUNT_H && defined(MS_BIND) && defined(CLONE_NEWNS) +#define CHROOT_ENABLED HAVE_CHROOT && HAVE_UNSHARE && HAVE_SYS_MOUNT_H && defined(MS_BIND) && defined(CLONE_NEWNS) namespace nix { |