From patchwork Sun May 12 10:37:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 13963 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 1FF4E16F4A; Sun, 12 May 2019 11:39:35 +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 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 9804516F26 for ; Sun, 12 May 2019 11:39:34 +0100 (BST) Received: from localhost ([127.0.0.1]:41531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPltG-0007Kl-2h for patchwork@mira.cbaines.net; Sun, 12 May 2019 06:39:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPlso-00071g-PJ for guix-patches@gnu.org; Sun, 12 May 2019 06:39:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPlsn-0007X9-KR for guix-patches@gnu.org; Sun, 12 May 2019 06:39:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56637) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPlsm-0007WH-3b for guix-patches@gnu.org; Sun, 12 May 2019 06:39:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPlsm-0002te-0o for guix-patches@gnu.org; Sun, 12 May 2019 06:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35697] [PATCH 5/8] linux-container: Compute essential services for THIS-OPERATING-SYSTEM. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 10:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35697 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35697@debbugs.gnu.org Received: via spool by 35697-submit@debbugs.gnu.org id=B35697.155765750511030 (code B ref 35697); Sun, 12 May 2019 10:39:03 +0000 Received: (at 35697) by debbugs.gnu.org; 12 May 2019 10:38:25 +0000 Received: from localhost ([127.0.0.1]:41936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPls8-0002rl-Nu for submit@debbugs.gnu.org; Sun, 12 May 2019 06:38:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38679) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPls7-0002qj-9a for 35697@debbugs.gnu.org; Sun, 12 May 2019 06:38:23 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54353) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPls2-0007JB-1i; Sun, 12 May 2019 06:38:18 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41590 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1hPls1-00052w-I1; Sun, 12 May 2019 06:38:17 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 12 May 2019 12:37:59 +0200 Message-Id: <20190512103802.17032-5-ludo@gnu.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512103802.17032-1-ludo@gnu.org> References: <20190512103802.17032-1-ludo@gnu.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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: , Cc: Chris Marusich Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Previously, the 'essential-services' would correspond to the initial, non-containerized OS. Thus, all the file systems removed in 'container-essential-services' would actually still be there because the essential services would be computed on the non-containerized OS. This is a followup to 69cae3d3356a69b7fe69481338f760545995485e. * gnu/system/linux-container.scm (container-essential-services): Call 'operating-system-default-essential-services' to get the baseline services. (containerized-operating-system): Pass THIS-OPERATING-SYSTEM, not OS, to 'container-essential-services'. Add a dummy root file system to 'file-systems'. --- gnu/system/linux-container.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index 5adec064f7..fc2e05a5bc 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -45,7 +45,7 @@ from OS that are needed on the bare metal and not in a container." (list (service-kind %linux-bare-metal-service) firmware-service-type system-service-type))) - (operating-system-essential-services os))) + (operating-system-default-essential-services os))) (cons (service system-service-type (let ((locale (operating-system-locale-directory os))) @@ -85,14 +85,20 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file systems to add to OS." (operating-system (inherit os) (swap-devices '()) ; disable swap - (essential-services (container-essential-services os)) + (essential-services (container-essential-services this-operating-system)) (services (remove (lambda (service) (memq (service-kind service) useless-services)) (operating-system-user-services os))) (file-systems (append (map mapping->fs mappings) extra-file-systems - user-file-systems)))) + user-file-systems + + ;; Provide a dummy root file system. + (list (file-system + (mount-point "/") + (device "none") + (type "none"))))))) (define* (container-script os #:key (mappings '())) "Return a derivation of a script that runs OS as a Linux container.