nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: container: Use the same clone flags as fork(3). 

The intent is to make 'clone' behave a lot more like 'primitive-fork', which
calls clone(2) with SIGCHLD, CLONE_CHILD_CLEARTID, and CLONE_CHILD_SETTID
flags.  Notably, running 'clone' at the REPL without these flags would break
the REPL beyond repair.

* guix/build/syscalls.scm (CLONE_CHILD_CLEARTID, CLONE_CHILD_SETTID): New
  variables.
* gnu/build/linux-container.scm (namespaces->bit-mask): Add
  CLONE_CHILD_CLEARTID and CLONE_CHILD_SETTID to bit mask.
master
David Thompson 2015-09-05 14:10:08 -04:00
parent 4949ada9da
commit ee78d02452
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/build/linux-container.scm
View File

@ -162,7 +162,8 @@ host user identifiers to map into the user namespace."
(define (namespaces->bit-mask namespaces) (define (namespaces->bit-mask namespaces)
"Return the number suitable for the 'flags' argument of 'clone' that "Return the number suitable for the 'flags' argument of 'clone' that
corresponds to the symbols in NAMESPACES." corresponds to the symbols in NAMESPACES."
(apply logior SIGCHLD ;; Use the same flags as fork(3) in addition to the namespace flags.
(apply logior SIGCHLD CLONE_CHILD_CLEARTID CLONE_CHILD_SETTID
(map (match-lambda (map (match-lambda
('mnt CLONE_NEWNS) ('mnt CLONE_NEWNS)
('uts CLONE_NEWUTS) ('uts CLONE_NEWUTS)

16
guix/build/syscalls.scm
View File

@ -50,6 +50,8 @@
mkdtemp! mkdtemp!
pivot-root pivot-root
CLONE_CHILD_CLEARTID
CLONE_CHILD_SETTID
CLONE_NEWNS CLONE_NEWNS
CLONE_NEWUTS CLONE_NEWUTS
CLONE_NEWIPC CLONE_NEWIPC
@ -303,12 +305,14 @@ string TMPL and return its file name. TMPL must end with 'XXXXXX'."
(pointer->string result))))) (pointer->string result)))))
;; Linux clone flags, from linux/sched.h ;; Linux clone flags, from linux/sched.h
(define CLONE_NEWNS #x00020000) (define CLONE_CHILD_CLEARTID #x00200000)
(define CLONE_NEWUTS #x04000000) (define CLONE_CHILD_SETTID #x01000000)
(define CLONE_NEWIPC #x08000000) (define CLONE_NEWNS #x00020000)
(define CLONE_NEWUSER #x10000000) (define CLONE_NEWUTS #x04000000)
(define CLONE_NEWPID #x20000000) (define CLONE_NEWIPC #x08000000)
(define CLONE_NEWNET #x40000000) (define CLONE_NEWUSER #x10000000)
(define CLONE_NEWPID #x20000000)
(define CLONE_NEWNET #x40000000)
;; The libc interface to sys_clone is not useful for Scheme programs, so the ;; The libc interface to sys_clone is not useful for Scheme programs, so the
;; low-level system call is wrapped instead. ;; low-level system call is wrapped instead.