[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: syscalls: setns: Skip binding if there is no such C function.
From: |
David Thompson |
Subject: |
01/01: syscalls: setns: Skip binding if there is no such C function. |
Date: |
Mon, 17 Aug 2015 18:53:05 +0000 |
davexunit pushed a commit to branch master
in repository guix.
commit 39e336b5c83e652feb1c3ac962b0929ca8466763
Author: David Thompson <address@hidden>
Date: Sun Aug 16 08:08:34 2015 -0400
syscalls: setns: Skip binding if there is no such C function.
On systems with a glibc prior to 2.14, the 'setns' function is not
available.
Thanks to Eric Bavier for reporting the issue.
* guix/build/syscalls.scm (setns): Wrap with 'false-if-exception'.
---
guix/build/syscalls.scm | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 68f340c..fc801a5 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -328,19 +328,22 @@ are shared between the parent and child processes."
(proc syscall-id flags %null-pointer))))
(define setns
- (let* ((ptr (dynamic-func "setns" (dynamic-link)))
- (proc (pointer->procedure int ptr (list int int))))
- (lambda (fdes nstype)
- "Reassociate the current process with the namespace specified by FDES, a
+ ;; Some systems may be using an old (pre-2.14) version of glibc where there
+ ;; is no 'setns' function available.
+ (false-if-exception
+ (let* ((ptr (dynamic-func "setns" (dynamic-link)))
+ (proc (pointer->procedure int ptr (list int int))))
+ (lambda (fdes nstype)
+ "Reassociate the current process with the namespace specified by FDES, a
file descriptor obtained by opening a /proc/PID/ns/* file. NSTYPE specifies
which type of namespace the current process may be reassociated with, or 0 if
there is no such limitation."
- (let ((ret (proc fdes nstype))
- (err (errno)))
- (unless (zero? ret)
- (throw 'system-error "setns" "~d ~d: ~A"
- (list fdes nstype (strerror err))
- (list err)))))))
+ (let ((ret (proc fdes nstype))
+ (err (errno)))
+ (unless (zero? ret)
+ (throw 'system-error "setns" "~d ~d: ~A"
+ (list fdes nstype (strerror err))
+ (list err))))))))
(define pivot-root
(let* ((ptr (dynamic-func "pivot_root" (dynamic-link)))