From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wG6ZKLjO3F8qOQAA0tVLHw (envelope-from ) for ; Fri, 18 Dec 2020 15:46:00 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id SC1XJLjO3F+KVwAAbx9fmQ (envelope-from ) for ; Fri, 18 Dec 2020 15:46:00 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3AECE94043B for ; Fri, 18 Dec 2020 15:46:00 +0000 (UTC) Received: from localhost ([::1]:44270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqHx9-0006aU-4v for larch@yhetil.org; Fri, 18 Dec 2020 10:45:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqHgk-0005YH-Qe for guix-patches@gnu.org; Fri, 18 Dec 2020 10:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kqHgk-0002QD-Id for guix-patches@gnu.org; Fri, 18 Dec 2020 10:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kqHgk-0004bM-Cu for guix-patches@gnu.org; Fri, 18 Dec 2020 10:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#40480] [PATCH v4] services: Add file system utilities to profile. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Dec 2020 15:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40480 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Received: via spool by 40480-submit@debbugs.gnu.org id=B40480.160830531917659 (code B ref 40480); Fri, 18 Dec 2020 15:29:02 +0000 Received: (at 40480) by debbugs.gnu.org; 18 Dec 2020 15:28:39 +0000 Received: from localhost ([127.0.0.1]:39655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqHgN-0004al-G9 for submit@debbugs.gnu.org; Fri, 18 Dec 2020 10:28:39 -0500 Received: from mira.cbaines.net ([212.71.252.8]:36596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kqHgL-0004ac-OJ for 40480@debbugs.gnu.org; Fri, 18 Dec 2020 10:28:38 -0500 Received: from localhost (188.30.130.172.threembb.co.uk [188.30.130.172]) by mira.cbaines.net (Postfix) with ESMTPSA id B5D8227BC05; Fri, 18 Dec 2020 15:28:36 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id d0b3efe8; Fri, 18 Dec 2020 15:28:34 +0000 (UTC) References: <20200407083054.19472-1-brice@waegenei.re> <20200423120002.32554-1-brice@waegenei.re> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: <20200423120002.32554-1-brice@waegenei.re> Date: Fri, 18 Dec 2020 15:28:34 +0000 Message-ID: <87k0tf16cd.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 40480@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.42 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3AECE94043B X-Spam-Score: -4.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: MbwVE/N0ubyz --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Brice Waegeneire writes: > * gnu/services/base.scm (file-system-type->utilities, > file-system-utilities): New procedures. > (file-system-service-type): Extend 'profile-service-type' with > 'file-system-utilities'. > * gnu/system.scm (boot-file-system-service): New procedure... > (operating-system-default-essential-services): ...use it. > (%base-packages): Remove 'e2fsprogs'. > * gnu/system/file-systems.scm (file-system): Add 'utilities?' field. > --- > > Fix bcachefs typo and replace 'utils' by 'utilities'. Reword the > documentation procedures to be clearer. Remove (srfi srfi-2) and (ice-9 > regex) which weren't used since v1. > > gnu/services/base.scm | 40 +++++++++++++++++++++++++++++++++++-- > gnu/system.scm | 28 ++++++++++++++++---------- > gnu/system/file-systems.scm | 6 +++++- > 3 files changed, 61 insertions(+), 13 deletions(-) Thanks for the updated patch Brian, and apologies it's taken so long to review. I've had a quick look through, and generally it looks fine to me. > diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm > index 3b599efa8e..f78c3b1b8e 100644 > --- a/gnu/system/file-systems.scm > +++ b/gnu/system/file-systems.scm > @@ -1,5 +1,6 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright =C2=A9 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Co= urt=C3=A8s > +;;; Copyright =C2=A9 2020 Brice Waegeneire > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -42,6 +43,7 @@ > file-system-create-mount-point? > file-system-dependencies > file-system-location > + file-system-utilities? >=20=20 > file-system-type-predicate >=20=20 > @@ -111,7 +113,9 @@ > (default '())) ; or > (location file-system-location > (default (current-source-location)) > - (innate))) > + (innate)) > + (utilities? file-system-utilities? ; Boolean > + (default #t))) >=20=20 > ;; A file system label for use in the 'device' field. > (define-record-type On utilties? here, I wonder if the name for this option could be clearer? Most of the other options can be interpreted in the context of the filesystem itself, but this is about whether the system profile should include utilities for that filesystem. I haven't got any particularly good ideas though, maybe system-include-utilities? I think utilities? is OK though, if someone wants to turn it off, then they'll probably be able to work out how. On that, maybe the only must before merging this is adding to the list of options in the documentation. Is this something you're able to do? Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl/cyqJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeEVQ//ZyZni8SoMgSEgfZyzamU9y+edxneaAao wpnq00AwLXnhnTA3LB0HlH+pgy9Qp0TSWVKSDa+aY1EkyJe/9JiaQ0uqaFrPY/FS vxDwPS6MJnPmG/akLTSVcQov26QgTrc9QIdH5bcXgQf9HCPRk4dnsViMlSvgqsFV LQqbD2MGWeMWhJFL5r4Y8Hc+iQpse5qxeGkgZ8A6gDjeL4gZmx/P8xhh6lU4wEP4 1/7Ranwey30q69FwtPhnhaLMsVJapTAKSrwFrC+79vp+wVZBVuakoY3fWgO9dmen vegnLB7ptJf+y/GfrhYMQkbUv0LoOChaInVZiPzmvMp5fTmYiS1ByhK0+RMXTytu jKt/D4kMnr+jLGBijZoueGIu3RWzdwhlOvfIsKqRUej4fVLy0As+MJKvHMfCEWK6 Sm8wfW9W+uXfJCNwfF0TKGlV04rcVW2oWd1dAJLJNRmdPt5QABSFk/G3YzxWUHQx ochSk9xW4lSDrPCKG6+gbDsk0DptlFdfUX2oeJKn3jLZ5zEPbh91HMjL6YZLDEdH jPzaHTaVBrWLIXNKD8LiiBwBvt9yYVxLqsauy8iypDrsab96VfmzfSNjuN6L+3Yi BP+9BBzrscDYI6fy0WnrAD3FJSfB5Z3EacjZyCoEgONvRdQwpGaMGGkQCD1q2I33 MDjDahQuezk= =EAre -----END PGP SIGNATURE----- --=-=-=--