From patchwork Mon Jan 25 08:48:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 26623 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 6D18627BC1B; Mon, 25 Jan 2021 08:49:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7B6B827BC1A for ; Mon, 25 Jan 2021 08:49:14 +0000 (GMT) Received: from localhost ([::1]:45454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3xYf-0006rx-ML for patchwork@mira.cbaines.net; Mon, 25 Jan 2021 03:49:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3xYU-0006ro-UR for guix-patches@gnu.org; Mon, 25 Jan 2021 03:49:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l3xYT-0001tY-Ub for guix-patches@gnu.org; Mon, 25 Jan 2021 03:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l3xYT-0007xw-Tc for guix-patches@gnu.org; Mon, 25 Jan 2021 03:49:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46043] [PATCH] Allow booting with custom shepherd package (fixed) Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jan 2021 08:49:01 +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: 46043@debbugs.gnu.org Received: via spool by 46043-submit@debbugs.gnu.org id=B46043.161156452630595 (code B ref 46043); Mon, 25 Jan 2021 08:49:01 +0000 Received: (at 46043) by debbugs.gnu.org; 25 Jan 2021 08:48:46 +0000 Received: from localhost ([127.0.0.1]:37862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3xYE-0007xO-8w for submit@debbugs.gnu.org; Mon, 25 Jan 2021 03:48:46 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:39044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3xYC-0007xE-0F for 46043@debbugs.gnu.org; Mon, 25 Jan 2021 03:48:45 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id Lwoh2400c0mfAB406wohov; Mon, 25 Jan 2021 09:48:42 +0100 Message-ID: <97fca7da3cf4fd0ff5aa554bc3ec95431f85e530.camel@telenet.be> From: Maxime Devos Date: Mon, 25 Jan 2021 09:48:36 +0100 In-Reply-To: <874kj8bv8w.fsf@telenet.be> References: <874kj8bv8w.fsf@telenet.be> User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1611564522; bh=GwB7QAwiD9yzA9guwxHomCzDygJgTq4zukb0dfcKKIA=; h=Subject:From:Reply-To:To:Cc:Date:In-Reply-To:References; b=s7qm4aQdAbXzbMl9/RmxtOsfIpQlyXr0f2BfK+RZ71xBExVSJdh+Ea5pAX6HT1tYj cuLMqAUcDoEhiKGHQy6tx5Ier/6AZ8HqYiFKat92oxZcGi5dmwsCAG1/8rK7yaT5+H KUf2ahibJVnJ633chrn10E6nuSAFdwZPKse/uHTZvXdq/ThXL/qFn9GW0QtIpqW1ON BZCmFcRLKnt5+dKSLjKxGwUkr1vAoXEXdqu3eCublwN6sDTDdZz+SB+ht442+5PZlo 9lIny1g0f61Cx1230bwKDYerp2IgTu5ee6bBZfX9F2IgqQRl4wPw6OBaP6LCmPw9PY CcVbBZJ6KR57A== 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: , Reply-To: 46043@debbugs.gnu.org Cc: Maxime Devos Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. --- doc/guix.texi | 17 ++++++++++++- gnu/services/shepherd.scm | 53 +++++++++++++++++++++++++++++---------- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a765b3792e..344ffcfea5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32707,9 +32707,24 @@ The service type for the Shepherd ``root service''---i.e., PID@tie{}1. This is the service type that extensions target when they want to create 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 +value must be a @code{shepherd-configuration}, as described below: @end defvr +@deftp {Data Type} shepherd-configuration +This data type represents shepherd's configuration. + +@table @code +@item shepherd (default: @code{shepherd}) +The shepherd package to use. + +@item services (default: @code{'()}) +A list of @code{} to start. +You should probably use the service extension +mechanism instead (@pxref{Shepherd Services}). +@end table +@end deftp + @defvr {Scheme Variable} %shepherd-root-service This service represents PID@tie{}1. @end defvr diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index d2f9776288..14a6aa14db 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2018 Carlo Zancanaro ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +37,12 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) - #:export (shepherd-root-service-type + #:export (shepherd-configuration + shepherd-configuration? + shepherd-configuration-shepherd + shepherd-configuration-services + + shepherd-root-service-type %shepherd-root-service shepherd-service-type @@ -76,7 +82,18 @@ ;;; Code: -(define (shepherd-boot-gexp services) +(define-record-type* + shepherd-configuration make-shepherd-configuration + shepherd-configuration? + (shepherd shepherd-configuration-shepherd + (default shepherd)) ; package + (services shepherd-configuration-services + (default '()))) ; list of + +(define (shepherd-boot-gexp config) + "Return a gexp starting the shepherd service." + (let ((shepherd (shepherd-configuration-shepherd config)) + (services (shepherd-configuration-services config))) #~(begin ;; Keep track of the booted system. (false-if-exception (delete-file "/run/booted-system")) @@ -95,7 +112,10 @@ ;; Start shepherd. (execl #$(file-append shepherd "/bin/shepherd") "shepherd" "--config" - #$(shepherd-configuration-file services)))) + #$(shepherd-configuration-file services #:shepherd shepherd))))) + +(define shepherd-packages + (compose list shepherd-configuration-shepherd)) (define shepherd-root-service-type (service-type @@ -103,20 +123,25 @@ ;; Extending the root shepherd service (aka. PID 1) happens by ;; concatenating the list of services provided by the extensions. (compose concatenate) - (extend append) + (extend (lambda (config extra-services) + (shepherd-configuration + (inherit config) + (services (append (shepherd-configuration-services config) + extra-services))))) (extensions (list (service-extension boot-service-type shepherd-boot-gexp) (service-extension profile-service-type - (const (list shepherd))))) + shepherd-packages))) + (default-value (shepherd-configuration)) (description "Run the GNU Shepherd as PID 1---i.e., the operating system's first process. The Shepherd takes care of managing services such as daemons by ensuring they are started and stopped in the right order."))) (define %shepherd-root-service - ;; The root shepherd service, aka. PID 1. Its parameter is a list of - ;; objects. - (service shepherd-root-service-type '())) + ;; The root shepherd service, aka. PID 1. Its parameter is a + ;; . + (service shepherd-root-service-type)) (define-syntax shepherd-service-type (syntax-rules (description) @@ -270,9 +295,9 @@ stored." #~(#$name #$doc #$proc))) (shepherd-service-actions service)))))))) -(define (scm->go file) +(define* (scm->go file #:key (shepherd shepherd)) "Compile FILE, which contains code to be loaded by shepherd's config file, -and return the resulting '.go' file." +and return the resulting '.go' file. SHEPHERD is used as shepherd package." (let-system (system target) (with-extensions (list shepherd) (computed-file (string-append (basename (scheme-file-name file) ".scm") @@ -294,11 +319,13 @@ and return the resulting '.go' file." #:options '(#:local-build? #t #:substitutable? #f))))) -(define (shepherd-configuration-file services) - "Return the shepherd configuration file for SERVICES." +(define* (shepherd-configuration-file services #:key (shepherd shepherd)) + "Return the shepherd configuration file for SERVICES. SHEPHERD is used +as shepherd package." (assert-valid-graph services) - (let ((files (map shepherd-service-file services))) + (let ((files (map shepherd-service-file services)) + (scm->go (cute scm->go <> #:shepherd shepherd))) (define config #~(begin (use-modules (srfi srfi-34) -- 2.30.0