From 831bc1468ea27732ba59d58e4b38a192151aa123 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 1 Aug 2015 21:04:31 -0400 Subject: build: container: Add #:host-uids argument to call-with-container. It's not always possible to map 65536 uids when creating a container as the root user within another user namespace. This is true when building Guix within the build daemon's container. By using a uid range of 1 by default, even as the root user, the tests now pass. * gnu/build/linux-container.scm (initialize-user-namespace, run-container): Add 'host-uids' argument. (call-with-container): Add #:host-uids keyword argument. * tests/containers.scm ("container-excursion"): Update 'run-container' call. --- tests/containers.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/containers.scm b/tests/containers.scm index cb1aeddcb1..cc90f1ed6c 100644 --- a/tests/containers.scm +++ b/tests/containers.scm @@ -102,7 +102,7 @@ (readlink (string-append "/proc/" pid "/ns/" ns))) '("user" "ipc" "uts" "net" "pid" "mnt")))) - (let* ((pid (run-container root '() %namespaces container)) + (let* ((pid (run-container root '() %namespaces 1 container)) (container-namespaces (namespaces pid)) (result (begin -- cgit 1.4.1