From patchwork Fri Apr 19 14:04:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 8360 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6DEC816ECD; Fri, 19 Apr 2019 15:11:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1153B16EC9 for ; Fri, 19 Apr 2019 15:11:12 +0100 (BST) Received: from localhost ([127.0.0.1]:57103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHUER-0001Lo-KM for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 10:11:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHU8b-0004aq-Qq for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHU8a-0005x0-CY for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59112) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHU8X-0005oT-Cv for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHU8X-0002SP-6b for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34638] [PATCH v2 1/4] utils: Add #:base-directory to call-with-temporary-directory. References: <875zt9go87.fsf@cbaines.net> In-Reply-To: <875zt9go87.fsf@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Apr 2019 14:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34638 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34638@debbugs.gnu.org Received: via spool by 34638-submit@debbugs.gnu.org id=B34638.15556826729380 (code B ref 34638); Fri, 19 Apr 2019 14:05:05 +0000 Received: (at 34638) by debbugs.gnu.org; 19 Apr 2019 14:04:32 +0000 Received: from localhost ([127.0.0.1]:44418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7z-0002R8-R6 for submit@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:32 -0400 Received: from mira.cbaines.net ([212.71.252.8]:48056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7x-0002QW-0b for 34638@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:30 -0400 Received: from localhost (71.38.6.51.dyn.plus.net [51.6.38.71]) by mira.cbaines.net (Postfix) with ESMTPSA id 5FE7A16ECF for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 15:04:27 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id d0bf4640 for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 14:04:27 +0000 (UTC) From: Christopher Baines Date: Fri, 19 Apr 2019 15:04:24 +0100 Message-Id: <20190419140427.15183-1-mail@cbaines.net> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows more easily creating temporary directories within a specific directory. This is motivated by using this in inferior-eval-with-store. * guix/utils.scm (call-with-temporary-directory): Add optional keyword argument, base-directory. --- guix/utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/utils.scm b/guix/utils.scm index ed1a418cca..abeb156f40 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -620,10 +620,10 @@ call." (false-if-exception (close out)) (false-if-exception (delete-file template)))))) -(define (call-with-temporary-directory proc) +(define* (call-with-temporary-directory proc #:key base-directory) "Call PROC with a name of a temporary directory; close the directory and delete it when leaving the dynamic extent of this call." - (let* ((directory (or (getenv "TMPDIR") "/tmp")) + (let* ((directory (or base-directory (getenv "TMPDIR") "/tmp")) (template (string-append directory "/guix-directory.XXXXXX")) (tmp-dir (mkdtemp! template))) (dynamic-wind From patchwork Fri Apr 19 14:04:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 8358 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4B02616ECD; Fri, 19 Apr 2019 15:09:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 858A616EC9 for ; Fri, 19 Apr 2019 15:09:44 +0100 (BST) Received: from localhost ([127.0.0.1]:57043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHUD1-00006O-Kr for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 10:09:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHU8b-0004ap-Qq for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHU8Z-0005u1-B8 for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59111) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHU8W-0005nP-R0 for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHU8U-0002SG-LN for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34638] [PATCH v2 2/4] linux-container: Add 'start-child-in-container'. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Apr 2019 14:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34638 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34638@debbugs.gnu.org Received: via spool by 34638-submit@debbugs.gnu.org id=B34638.15556826719373 (code B ref 34638); Fri, 19 Apr 2019 14:05:02 +0000 Received: (at 34638) by debbugs.gnu.org; 19 Apr 2019 14:04:31 +0000 Received: from localhost ([127.0.0.1]:44416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7z-0002R1-D2 for submit@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:31 -0400 Received: from mira.cbaines.net ([212.71.252.8]:48050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7w-0002QT-TL for 34638@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:29 -0400 Received: from localhost (71.38.6.51.dyn.plus.net [51.6.38.71]) by mira.cbaines.net (Postfix) with ESMTPSA id 8AF7116ED1 for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 15:04:27 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id ba0d485d for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 14:04:27 +0000 (UTC) From: Christopher Baines Date: Fri, 19 Apr 2019 15:04:25 +0100 Message-Id: <20190419140427.15183-2-mail@cbaines.net> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190419140427.15183-1-mail@cbaines.net> References: <20190419140427.15183-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This new procedure is similar to open-pipe* in (ice-9 popen), but using run-container from (gnu build linux-container). * gnu/build/linux-container.scm (start-child-in-container): New procedure. --- gnu/build/linux-container.scm | 83 +++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/gnu/build/linux-container.scm b/gnu/build/linux-container.scm index 3d7b52f098..88b00e00f6 100644 --- a/gnu/build/linux-container.scm +++ b/gnu/build/linux-container.scm @@ -32,6 +32,7 @@ setgroups-supported? %namespaces run-container + start-child-in-container call-with-container container-excursion container-excursion*)) @@ -213,6 +214,88 @@ corresponds to the symbols in NAMESPACES." ('net CLONE_NEWNET)) namespaces))) +(define* (start-child-in-container command + #:key read? write? + (root 'temporary) + (mounts '()) + (namespaces %namespaces) + (host-uids 1) + (extra-environment-variables '())) + (define (with-root-directory f) + (if (eq? root 'temporary) + (call-with-temporary-directory f) + (f root))) + + (define (make-rw-port read-port write-port) + (make-soft-port + (vector + (lambda (c) (write-char c write-port)) + (lambda (s) (display s write-port)) + (lambda () (force-output write-port)) + (lambda () (read-char read-port)) + (lambda () (close-port read-port) (close-port write-port))) + "r+")) + + ;; car is the inport port, cdr is the output port. You write to the output + ;; port, and read from the input port. + (define child-to-parent-pipe + (if read? + (pipe) + #f)) + + (define parent-to-child-pipe + (if write? + (pipe) + #f)) + + (define (run-program) + (when read? + (match child-to-parent-pipe + ((input-port . output-port) + ;; close the output part of the child-to-parent-pipe, as this is used + ;; by the parent process + (close-port input-port) + + ;; Make the input part of the child-to-parent-pipe the standard + ;; output of this process + (dup2 (fileno output-port) 1)))) + + (when write? + (match parent-to-child-pipe + ((input-port . output-port) + ;; close the input part of the parent-to-child-pipe, as this is used + ;; by the parent processs + (close-port output-port) + + ;; Make the output part of the parent-to-child-pipe the standard + ;; input of this process + (dup2 (fileno input-port) 0)))) + + ;; TODO Maybe close all file descriptors, as start_child in Guile does? + + (for-each putenv extra-environment-variables) + + (apply execlp command)) + + (with-root-directory + (lambda (root) + (let ((pid (run-container root mounts namespaces host-uids run-program))) + ;; Catch SIGINT and kill the container process. + (sigaction SIGINT + (lambda (signum) + (false-if-exception + (kill pid SIGKILL)))) + + (let* ((read-port (and=> child-to-parent-pipe car)) + (write-port (and=> parent-to-child-pipe cdr)) + + (port (or (and read-port write-port + (make-rw-port read-port write-port)) + read-port + write-port))) + + (values port pid)))))) + (define* (run-container root mounts namespaces host-uids thunk #:key (guest-uid 0) (guest-gid 0)) "Run THUNK in a new container process and return its PID. ROOT specifies From patchwork Fri Apr 19 14:04:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 8359 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1434C16ECD; Fri, 19 Apr 2019 15:10:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6B98416EC9 for ; Fri, 19 Apr 2019 15:10:11 +0100 (BST) Received: from localhost ([127.0.0.1]:57075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHUDT-0000VF-0D for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 10:10:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHU8a-0004am-Cd for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHU8W-0005li-E7 for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59110) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHU8U-0005gg-A5 for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHU8U-0002S8-0I for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34638] [PATCH v2 3/4] inferior: Add a shared-directory field to Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Apr 2019 14:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34638 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34638@debbugs.gnu.org Received: via spool by 34638-submit@debbugs.gnu.org id=B34638.15556826719366 (code B ref 34638); Fri, 19 Apr 2019 14:05:01 +0000 Received: (at 34638) by debbugs.gnu.org; 19 Apr 2019 14:04:31 +0000 Received: from localhost ([127.0.0.1]:44414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7z-0002Qy-1D for submit@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:31 -0400 Received: from mira.cbaines.net ([212.71.252.8]:48052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7w-0002QU-UD for 34638@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:29 -0400 Received: from localhost (71.38.6.51.dyn.plus.net [51.6.38.71]) by mira.cbaines.net (Postfix) with ESMTPSA id B44D016ED2 for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 15:04:27 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e6a8908b for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 14:04:27 +0000 (UTC) From: Christopher Baines Date: Fri, 19 Apr 2019 15:04:26 +0100 Message-Id: <20190419140427.15183-3-mail@cbaines.net> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190419140427.15183-1-mail@cbaines.net> References: <20190419140427.15183-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- guix/inferior.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/guix/inferior.scm b/guix/inferior.scm index 63c95141d7..6d18ab90e9 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -97,14 +97,15 @@ ;; Inferior Guix process. (define-record-type - (inferior pid socket close version packages table) + (inferior pid socket close shared-directory version packages table) inferior? - (pid inferior-pid) - (socket inferior-socket) - (close inferior-close-socket) ;procedure - (version inferior-version) ;REPL protocol version - (packages inferior-package-promise) ;promise of inferior packages - (table inferior-package-table)) ;promise of vhash + (pid inferior-pid) + (socket inferior-socket) + (close inferior-close-socket) ;procedure + (shared-directory inferior-shared-directory) + (version inferior-version) ;REPL protocol version + (packages inferior-package-promise) ;promise of inferior packages + (table inferior-package-table)) ;promise of vhash (define (inferior-pipe directory command) "Return an input/output pipe on the Guix instance in DIRECTORY. This runs @@ -136,7 +137,7 @@ it's an old Guix." ((@ (guix scripts repl) machine-repl)))))) pipe))) -(define* (port->inferior pipe #:optional (close close-port)) +(define* (port->inferior pipe shared-directory #:optional (close close-port)) "Given PIPE, an input/output port, return an inferior that talks over PIPE. PIPE is closed with CLOSE when 'close-inferior' is called on the returned inferior." @@ -144,7 +145,8 @@ inferior." (match (read pipe) (('repl-version 0 rest ...) - (letrec ((result (inferior 'pipe pipe close (cons 0 rest) + (letrec ((result (inferior 'pipe pipe close shared-directory + (cons 0 rest) (delay (%inferior-packages result)) (delay (%inferior-package-table result))))) (inferior-eval '(use-modules (guix)) result) @@ -162,7 +164,7 @@ equivalent. Return #f if the inferior could not be launched." (define pipe (inferior-pipe directory command)) - (port->inferior pipe close-pipe)) + (port->inferior pipe #f close-pipe)) (define (close-inferior inferior) "Close INFERIOR." @@ -479,7 +481,8 @@ thus be the code of a one-argument procedure that accepts a store." ((client . address) (proxy client (store-connection-socket store)))) (close-port socket) - (read-inferior-response inferior))))) + (read-inferior-response inferior))) + #:base-directory (inferior-shared-directory inferior))) (define* (inferior-package-derivation store package #:optional From patchwork Fri Apr 19 14:04:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 8361 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DB12016ECD; Fri, 19 Apr 2019 15:11:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 469CB16EC9 for ; Fri, 19 Apr 2019 15:11:19 +0100 (BST) Received: from localhost ([127.0.0.1]:57107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHUEY-0001Ql-Rd for patchwork@mira.cbaines.net; Fri, 19 Apr 2019 10:11:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHU8d-0004eR-Kc for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHU8b-0005yr-Hq for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59113) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hHU8X-0005q6-VG for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hHU8X-0002SW-NR for guix-patches@gnu.org; Fri, 19 Apr 2019 10:05:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#34638] [PATCH v2 4/4] inferior: Add 'open-inferior/container'. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Apr 2019 14:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34638 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34638@debbugs.gnu.org Received: via spool by 34638-submit@debbugs.gnu.org id=B34638.15556826729387 (code B ref 34638); Fri, 19 Apr 2019 14:05:05 +0000 Received: (at 34638) by debbugs.gnu.org; 19 Apr 2019 14:04:32 +0000 Received: from localhost ([127.0.0.1]:44420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU80-0002RF-3N for submit@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:32 -0400 Received: from mira.cbaines.net ([212.71.252.8]:48054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hHU7x-0002QV-2Y for 34638@debbugs.gnu.org; Fri, 19 Apr 2019 10:04:30 -0400 Received: from localhost (71.38.6.51.dyn.plus.net [51.6.38.71]) by mira.cbaines.net (Postfix) with ESMTPSA id DC9EF16ED3 for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 15:04:27 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 12551412 for <34638@debbugs.gnu.org>; Fri, 19 Apr 2019 14:04:27 +0000 (UTC) From: Christopher Baines Date: Fri, 19 Apr 2019 15:04:27 +0100 Message-Id: <20190419140427.15183-4-mail@cbaines.net> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190419140427.15183-1-mail@cbaines.net> References: <20190419140427.15183-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches --- guix/inferior.scm | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/guix/inferior.scm b/guix/inferior.scm index 6d18ab90e9..8238c7fb38 100644 --- a/guix/inferior.scm +++ b/guix/inferior.scm @@ -19,6 +19,7 @@ (define-module (guix inferior) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) + #:use-module (srfi srfi-11) #:use-module ((guix utils) #:select (%current-system source-properties->location @@ -40,6 +41,9 @@ #:use-module (guix store) #:use-module (guix derivations) #:use-module (guix base32) + #:use-module (gnu system file-systems) + #:use-module (gnu build linux-container) + #:use-module (guix build syscalls) #:use-module (gcrypt hash) #:autoload (guix cache) (maybe-remove-expired-cache-entries) #:autoload (guix ui) (show-what-to-build*) @@ -54,6 +58,7 @@ #:use-module ((rnrs bytevectors) #:select (string->utf8)) #:export (inferior? open-inferior + open-inferior/container port->inferior close-inferior inferior-eval @@ -137,6 +142,77 @@ it's an old Guix." ((@ (guix scripts repl) machine-repl)))))) pipe))) +(define* (open-inferior/container store guix-store-item + #:key + (command "bin/guix") + (share-host-network? #f) + (extra-shared-directories '()) + (extra-environment-variables '())) + (define requisite-store-items + (requisites store (list guix-store-item))) + + (define shared-directory + (mkdtemp! (string-append (or (getenv "TMPDIR") "/tmp") + "/guix-inferior.XXXXXX"))) + + (define mappings + (append + (map (lambda (dir) + (file-system-mapping + (source dir) + (target dir) + (writable? #f))) + `(;; Share a directory, used in inferior-eval-with-store + ,shared-directory + ,@requisite-store-items + ,@extra-shared-directories)) + (if share-host-network? + %network-file-mappings + '()))) + + (define mounts + (append %container-file-systems + (map file-system-mapping->bind-mount + mappings))) + + (define (inferior-pipe/container store + guix-store-item + shared-directory + command) + (start-child-in-container + (list (string-append guix-store-item "/bin/guix") + ;; TODO I'm not sure why "repl" is duplicated in the following + ;; command + "repl" "repl" "-t" "machine") + #:read? #t + #:write? #t + #:mounts mounts + #:namespaces (if share-host-network? + (delq 'net %namespaces) + %namespaces) + #:extra-environment-variables + `(;; Set HOME, so that the (guix profiles) module can be loaded, without it + ;; trying to read from /etc/passwd + "HOME=/tmp" + ,@extra-environment-variables))) + + (let*-values + (((pipe pid) + (inferior-pipe/container store + guix-store-item + shared-directory + command)) + ((close-inferior-pipe) + (lambda (pipe*) + (unless (eq? pipe pipe*) + (error "wrong pipe being closed")) + (close-port pipe) + (cdr (waitpid pid))))) + + (port->inferior pipe + shared-directory + close-inferior-pipe))) + (define* (port->inferior pipe shared-directory #:optional (close close-port)) "Given PIPE, an input/output port, return an inferior that talks over PIPE. PIPE is closed with CLOSE when 'close-inferior' is called on the returned