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 ma/eDsCAEGDIIgAA0tVLHw (envelope-from ) for ; Tue, 26 Jan 2021 20:51:12 +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 GKM6CsCAEGDXVAAAbx9fmQ (envelope-from ) for ; Tue, 26 Jan 2021 20:51:12 +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 99D5C9402B5 for ; Tue, 26 Jan 2021 20:51:11 +0000 (UTC) Received: from localhost ([::1]:52474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4VIs-0005b0-Cz for larch@yhetil.org; Tue, 26 Jan 2021 15:51:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4VIk-0005ae-OP for guix-patches@gnu.org; Tue, 26 Jan 2021 15:51:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4VIk-0005PD-HG for guix-patches@gnu.org; Tue, 26 Jan 2021 15:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4VIk-0004fn-Ff for guix-patches@gnu.org; Tue, 26 Jan 2021 15:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46043] [PATCH] Allow booting with custom shepherd package (fixed) Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Jan 2021 20:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Received: via spool by 46043-submit@debbugs.gnu.org id=B46043.161169420817888 (code B ref 46043); Tue, 26 Jan 2021 20:51:02 +0000 Received: (at 46043) by debbugs.gnu.org; 26 Jan 2021 20:50:08 +0000 Received: from localhost ([127.0.0.1]:42757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4VHr-0004eR-LT for submit@debbugs.gnu.org; Tue, 26 Jan 2021 15:50:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4VHp-0004ds-Lr for 46043@debbugs.gnu.org; Tue, 26 Jan 2021 15:50:06 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60112) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4VHj-00056L-IS; Tue, 26 Jan 2021 15:49:59 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=42706 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1l4VHj-0001uV-5B; Tue, 26 Jan 2021 15:49:59 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <874kj8bv8w.fsf@telenet.be> <97fca7da3cf4fd0ff5aa554bc3ec95431f85e530.camel@telenet.be> Date: Tue, 26 Jan 2021 21:49:57 +0100 In-Reply-To: <97fca7da3cf4fd0ff5aa554bc3ec95431f85e530.camel@telenet.be> (Maxime Devos's message of "Mon, 25 Jan 2021 09:48:36 +0100") Message-ID: <875z3jzami.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: 46043@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: -2.85 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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: 99D5C9402B5 X-Spam-Score: -2.85 X-Migadu-Scanner: scn1.migadu.com X-TUID: WOLv5KVVcSkz Hi Maxime, Maxime Devos skribis: > Version 2 of the patch is attached. This version also uses > the custom package for /run/current-system/profile/bin/shepherd. > > From b3102f72cd66dee4442596d89e29900b8215e1be Mon Sep 17 00:00:00 2001 > From: Maxime Devos > Date: Fri, 22 Jan 2021 20:06:55 +0100 > Subject: [PATCH] services: shepherd: allow custom 'shepherd' package > > * gnu/services/shepherd.scm > (): New record. > (shepherd-boot-gexp, shepherd-root-service-type): Use it. > (scm->go, shepherd-configuration-file): Allow passing custom > shepherd package. > * doc/guix.texi (Shepherd Services). Document it. Nice! Overall LGTM. Nitpicking: > shepherd services (@pxref{Service Types and Services}, for an example). > -Each extension must pass a list of @code{}. > +Each extension must pass a list of @code{}. Its Please leave two spaces after end-of-sentence periods. > +value must be a @code{shepherd-configuration}, as described below: End with period rather than colon. > +@deftp {Data Type} shepherd-configuration > +This data type represents shepherd's configuration. s/shepherd/the Shepherd/ (referring to the software). > +@table @code > +@item shepherd (default: @code{shepherd}) > +The shepherd package to use. =E2=80=9CShepherd=E2=80=9D (capitalized). > +(define* (scm->go file #:key (shepherd shepherd)) [...] > +(define* (shepherd-configuration-file services #:key (shepherd shepherd)) I=E2=80=99d made the second argument compulsory instead of a keyword parame= ter. That=E2=80=99s all. Could you send an updated patch? Thanks for addressing this longstanding shortcoming! Ludo=E2=80=99.