From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:34941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTBbD-0002AO-VX for guix-patches@gnu.org; Tue, 21 May 2019 16:43:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTBbC-0007jF-Bv for guix-patches@gnu.org; Tue, 21 May 2019 16:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55791) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTBbC-0007iv-8g for guix-patches@gnu.org; Tue, 21 May 2019 16:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hTBbC-0002EU-1L for guix-patches@gnu.org; Tue, 21 May 2019 16:43:02 -0400 Subject: [bug#35851] [PATCH] linux-container: Check if nscd run directory exists when container is run. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:34205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTBa6-0000p0-Tg for guix-patches@gnu.org; Tue, 21 May 2019 16:41:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTBOV-0007dD-21 for guix-patches@gnu.org; Tue, 21 May 2019 16:29:56 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:53622) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTBOT-0007bU-Vh for guix-patches@gnu.org; Tue, 21 May 2019 16:29:54 -0400 From: Arun Isaac Date: Wed, 22 May 2019 01:59:27 +0530 Message-Id: <20190521202927.5591-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35851@debbugs.gnu.org * gnu/system/linux-container.scm (containerized-operating-system): (container-script): Check for existence of the host nscd run directory in the container script. This check should be run when the container is started, not when the container script is created. [network-mappings]: Delete variable. [nscd-run-directory, nscd-mapping]: New variables. --- gnu/system/linux-container.scm | 53 ++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index 16eee7a3cd..c1e963d047 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -109,7 +109,10 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file systems to add to OS." (memq (service-kind service) useless-services)) (operating-system-user-services os))) - (file-systems (append (map mapping->fs mappings) + (file-systems (append (map mapping->fs + (if shared-network? + (append %network-file-mappings mappings) + mappings)) extra-file-systems user-file-systems @@ -124,32 +127,33 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file systems to add to OS." "Return a derivation of a script that runs OS as a Linux container. MAPPINGS is a list of objects that specify the files/directories that will be shared with the host system." - (define network-mappings - ;; Files to map if network is to be shared with the host - (append %network-file-mappings - (let ((nscd-run-directory "/var/run/nscd")) - (if (file-exists? nscd-run-directory) - (list (file-system-mapping - (source nscd-run-directory) - (target nscd-run-directory))) - '())))) + (define nscd-run-directory "/var/run/nscd") + + (define nscd-mapping + (file-system-mapping + (source nscd-run-directory) + (target nscd-run-directory))) (define (mountable-file-system? file-system) ;; Return #t if FILE-SYSTEM should be mounted in the container. (and (not (string=? "/" (file-system-mount-point file-system))) (file-system-needed-for-boot? file-system))) - (let* ((os (containerized-operating-system - os - (cons %store-mapping - (if shared-network? - (append network-mappings mappings) - mappings)) - #:shared-network? shared-network? - #:extra-file-systems %container-file-systems)) - (file-systems (filter mountable-file-system? - (operating-system-file-systems os))) - (specs (map file-system->spec file-systems))) + (define (os-file-system-specs os) + (map file-system->spec + (filter mountable-file-system? + (operating-system-file-systems os)))) + + (let* ((os (containerized-operating-system + os (cons %store-mapping mappings) + #:shared-network? shared-network? + #:extra-file-systems %container-file-systems)) + (nscd-os (containerized-operating-system + os (cons* nscd-mapping %store-mapping mappings) + #:shared-network? shared-network? + #:extra-file-systems %container-file-systems)) + (specs (os-file-system-specs os)) + (nscd-specs (os-file-system-specs nscd-os))) (define script (with-imported-modules (source-module-closure @@ -160,7 +164,12 @@ that will be shared with the host system." (gnu system file-systems) ;spec->file-system (guix build utils)) - (call-with-container (map spec->file-system '#$specs) + (call-with-container + (map spec->file-system + (if (and #$shared-network? + (file-exists? #$nscd-run-directory)) + '#$nscd-specs + '#$specs)) (lambda () (setenv "HOME" "/root") (setenv "TMPDIR" "/tmp") -- 2.21.0