Received: (at 76502-done) by debbugs.gnu.org; 4 Mar 2025 23:32:31 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Mar 04 18:32:31 2025 Received: from localhost ([127.0.0.1]:33528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tpbkV-000538-I6 for submit <at> debbugs.gnu.org; Tue, 04 Mar 2025 18:32:31 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:45080) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tpbkT-00052V-2F for 76502-done <at> debbugs.gnu.org; Tue, 04 Mar 2025 18:32:29 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 72CDA1F4; Wed, 5 Mar 2025 00:32:20 +0100 (CET) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id CXXW0cQP2I3M; Wed, 5 Mar 2025 00:32:19 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 144641C4; Wed, 5 Mar 2025 00:32:17 +0100 (CET) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Tomas Volf <~@wolfsden.cz> Subject: Re: [bug#76502] [PATCH] services: =?utf-8?Q?=E2=80=98shepherd-ser?= =?utf-8?Q?vice-upgrade=E2=80=99?= handles canonical name changes. In-Reply-To: <87r03fjn97.fsf@HIDDEN> (Tomas Volf's message of "Sun, 02 Mar 2025 19:33:40 +0100") References: <220207cd49aa16783ecb3c4293e1e75dedeae8fa.1740321954.git.ludo@HIDDEN> <87r03fjn97.fsf@HIDDEN> Date: Wed, 05 Mar 2025 00:32:16 +0100 Message-ID: <87sens74ov.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Server: hera X-Rspamd-Queue-Id: 72CDA1F4 X-Spamd-Result: default: False [4.90 / 15.00]; SPAM_FLAG(5.00)[]; NEURAL_SPAM(3.00)[1.000]; BAYES_HAM(-3.00)[99.98%]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Spamd-Bar: ++++ X-Rspamd-Action: no action X-Spam-Level: **** X-Spam-Score: 3.5 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Pushed as 749eb1a2dd9fdf63a71f223b3f6756d9cb5940e6, thanks! Content analysis details: (3.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [185.233.100.1 listed in sa-accredit.habeas.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [185.233.100.1 listed in bl.score.senderscore.com] 0.0 TVD_SPACE_RATIO No description available. 2.5 TVD_SPACE_RATIO_MINFP Space ratio (vertical text obfuscation?) X-Debbugs-Envelope-To: 76502-done Cc: 76502-done <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) Pushed as 749eb1a2dd9fdf63a71f223b3f6756d9cb5940e6, thanks!
Ludovic Courtès <ludo@HIDDEN>:Ludovic Courtès <ludo@HIDDEN>:
Received: (at 76502) by debbugs.gnu.org; 2 Mar 2025 18:33:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Mar 02 13:33:45 2025
Received: from localhost ([127.0.0.1]:35057 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1too8H-0002bA-Hs
for submit <at> debbugs.gnu.org; Sun, 02 Mar 2025 13:33:45 -0500
Received: from wolfsden.cz ([37.205.8.62]:45750)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1too8F-0002aw-5A
for 76502 <at> debbugs.gnu.org; Sun, 02 Mar 2025 13:33:44 -0500
Received: by wolfsden.cz (Postfix, from userid 104)
id 8063D35A0D5; Sun, 2 Mar 2025 18:33:41 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
t=1740940421; bh=Uj2bYzz/W+xEporAxH15yh2chUEE6DUPz/SJpOFMBvk=;
h=From:To:Cc:Subject:In-Reply-To:References:Date;
b=WalVkbV5QcHOOACoBbLtxuhSoeBe8IxTMH7Y731nvGRi9XRcheM03XvLHxmr1EGPA
07XcU+UwsRW/YVuJLt8fcjZ5umPpMZX0DxBOBNzPPfyCQXlVeS7mRSOiTXzoBpFOtM
QgRJN3YM8GIcFA+QwjdJGg+WSQFXbiKtUGXVSoquA0d7AVueDMfmmxjzsFt2o0sXEq
oy9C6XqCD5DTqP9hougMhpbWp30jVjH4if0S3mwXbWGQBq5bttCaxrtH9nv+I+5lga
zKvkVngScKCuYPj8UdfL6nG2JW1o08M9GZ+McK8NEob8nkQMiJ5S8nA3aH1QlXr2en
Jshead0keaHYi4zXyAE/cZf7PJ7tlRJ/hwgXvhGkeeo5CKLuUS38PotASmNvryHzyx
HL0iqUQWi/QSq7P3eadFZp/DLsxar2dDjxUrfziEgz2NLELoPVZSbn3AbZnzEiFjUS
TtaP8UkQZjbtvl2anKMuUP82R3IJ80nVx1z562AamuiHFq006EcnFlwoA3GfwzwYrm
Ttbi84G3kDlsV2g/Y0ftgi7SmESLueqNXDEpiEougvj0V3g0xIx4xe9Eci8PnqNEpp
vjV5RlHk37pBP+1DvXaDIktQ9SYXHqLU0x+DIVKbJK8hT7JyHnY5FReLz+26BluuSM
txwSGqc1EOukduTY/dhOJQJw=
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on wolfsden
X-Spam-Level:
X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED
autolearn=ham autolearn_force=no version=3.4.6
Received: from localhost (unknown [128.0.188.242])
by wolfsden.cz (Postfix) with ESMTPSA id 3221935A8DD;
Sun, 2 Mar 2025 18:33:41 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail;
t=1740940421; bh=Uj2bYzz/W+xEporAxH15yh2chUEE6DUPz/SJpOFMBvk=;
h=From:To:Cc:Subject:In-Reply-To:References:Date;
b=WalVkbV5QcHOOACoBbLtxuhSoeBe8IxTMH7Y731nvGRi9XRcheM03XvLHxmr1EGPA
07XcU+UwsRW/YVuJLt8fcjZ5umPpMZX0DxBOBNzPPfyCQXlVeS7mRSOiTXzoBpFOtM
QgRJN3YM8GIcFA+QwjdJGg+WSQFXbiKtUGXVSoquA0d7AVueDMfmmxjzsFt2o0sXEq
oy9C6XqCD5DTqP9hougMhpbWp30jVjH4if0S3mwXbWGQBq5bttCaxrtH9nv+I+5lga
zKvkVngScKCuYPj8UdfL6nG2JW1o08M9GZ+McK8NEob8nkQMiJ5S8nA3aH1QlXr2en
Jshead0keaHYi4zXyAE/cZf7PJ7tlRJ/hwgXvhGkeeo5CKLuUS38PotASmNvryHzyx
HL0iqUQWi/QSq7P3eadFZp/DLsxar2dDjxUrfziEgz2NLELoPVZSbn3AbZnzEiFjUS
TtaP8UkQZjbtvl2anKMuUP82R3IJ80nVx1z562AamuiHFq006EcnFlwoA3GfwzwYrm
Ttbi84G3kDlsV2g/Y0ftgi7SmESLueqNXDEpiEougvj0V3g0xIx4xe9Eci8PnqNEpp
vjV5RlHk37pBP+1DvXaDIktQ9SYXHqLU0x+DIVKbJK8hT7JyHnY5FReLz+26BluuSM
txwSGqc1EOukduTY/dhOJQJw=
From: Tomas Volf <~@wolfsden.cz>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: Re: [bug#76502] [PATCH] services: =?utf-8?Q?=E2=80=98shepherd-ser?=
=?utf-8?Q?vice-upgrade=E2=80=99?= handles canonical name changes.
In-Reply-To: <220207cd49aa16783ecb3c4293e1e75dedeae8fa.1740321954.git.ludo@HIDDEN>
("Ludovic =?utf-8?Q?Court=C3=A8s=22's?= message of "Sun, 23 Feb 2025
15:47:41 +0100")
References: <220207cd49aa16783ecb3c4293e1e75dedeae8fa.1740321954.git.ludo@HIDDEN>
Date: Sun, 02 Mar 2025 19:33:40 +0100
Message-ID: <87r03fjn97.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76502
Cc: 76502 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Reviewed-by: Tomas Volf <~@wolfsden.cz>
guix-patches@HIDDEN:bug#76502; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 23 Feb 2025 14:48:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 23 09:48:11 2025
Received: from localhost ([127.0.0.1]:60088 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tmDH8-0004xc-WA
for submit <at> debbugs.gnu.org; Sun, 23 Feb 2025 09:48:11 -0500
Received: from lists.gnu.org ([2001:470:142::17]:47762)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tmDH5-0004wv-K4
for submit <at> debbugs.gnu.org; Sun, 23 Feb 2025 09:48:08 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tmDGx-0005d0-7n
for guix-patches@HIDDEN; Sun, 23 Feb 2025 09:47:59 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1tmDGv-00075y-MO; Sun, 23 Feb 2025 09:47:57 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to:
references; bh=n++lYMMtAHP353rU9/L38zsmXIkqLZXPKEBph3iYvj0=; b=IgV12vgqgJe/RZ
Ci7yTlVncJXLZxwkvN2EKFqXgUzU0nvd10yiVLJfPGhGFFQGMgxJc1P/jT+a/LGH1K8NaoKVQeIsq
sF5PFu7CFjRvbzidPrnVR3Bibs+XjNfeXzmb9vpw/W7Iim5RYxNSmY2IX2O/4edKzK9+bsRz0bWmB
lZV0DSbVjryO67PFtCs5VoJB22PPpPhBlmJTj56y1b+n3QcuXiQQSQTjd/xKu18jWcFZf67IqiP8H
IqJtKIOGJ3iw5OuexBz9aFnfjOW7gXYBXVu3xsKVG+ibzpYjOlG1yGXW7lFa+Y5TTrC98LN8YL0Vh
bVMx+9zt2rPky4/U2o9w==;
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] =?UTF-8?q?services:=20=E2=80=98shepherd-service-upgrade?=
=?UTF-8?q?=E2=80=99=20handles=20canonical=20name=20changes.?=
Date: Sun, 23 Feb 2025 15:47:41 +0100
Message-ID: <220207cd49aa16783ecb3c4293e1e75dedeae8fa.1740321954.git.ludo@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Debbugs-Cc: Christopher Baines <guix@HIDDEN>, Josselin Poiret <dev@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Mathieu Othacehe <othacehe@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>, Tobias Geerinckx-Rice <me@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: submit
Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@HIDDEN>,
Tomas Volf <~@wolfsden.cz>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Partly fixes <https://issues.guix.gnu.org/76315>.
Fixes a bug whereby a service whose canonical name has changed would not
be restarted—e.g., if '(syslogd) has a replacement providing
'(system-log syslogd).
* gnu/services/shepherd.scm (shepherd-service-upgrade)[running?]:
Remove.
[to-restart]: Change to a subset of LIVE. Look up all the names of each
element of TARGET.
* guix/scripts/system/reconfigure.scm (upgrade-shepherd-services):
TO-RESTART is now a list of <live-service>; adjust accordingly.
* tests/services.scm ("shepherd-service-upgrade: one unchanged, one upgraded, one new"):
("shepherd-service-upgrade: service depended on is not unloaded"):
("shepherd-service-upgrade: obsolete services that depend on each other"):
("shepherd-service-upgrade: transient service"): Adjust accordingly.
("shepherd-service-upgrade: service has new canonical name"): New test.
Reported-by: Tomas Volf <~@wolfsden.cz>
Change-Id: I7cec495b4e824da5fad5518f039607cf92f935d9
---
gnu/services/shepherd.scm | 18 ++++++++++--------
guix/scripts/system/reconfigure.scm | 2 +-
tests/services.scm | 27 ++++++++++++++++++++++-----
3 files changed, 33 insertions(+), 14 deletions(-)
Hello!
This should fix the ‘guix deploy’ warning Tomas reported
in <https://issues.guix.gnu.org/76315> when upgrading to the
Shepherd’s ‘system-log’.
In short, confusion was cause by the fact that '(syslogd) was
to be replaced by '(system-log syslogd), and the canonical name
of the latter is ‘system-log’, not ‘syslogd’.
Ludo’.
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index cfbb3f1e30a..65c49b9c59a 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -517,8 +517,8 @@ (define* (shepherd-service-back-edges services
(define (shepherd-service-upgrade live target)
"Return two values: the subset of LIVE (a list of <live-service>) that needs
-to be unloaded, and the subset of TARGET (a list of <shepherd-service>) that
-need to be restarted to complete their upgrade."
+to be unloaded, and the subset of LIVE that needs to be restarted to complete
+their upgrade."
(define (essential? service)
(memq (first (live-service-provision service))
'(root shepherd)))
@@ -531,10 +531,6 @@ (define (shepherd-service-upgrade live target)
(shepherd-service-lookup-procedure live
live-service-provision))
- (define (running? service)
- (and=> (lookup-live (shepherd-service-canonical-name service))
- live-service-running))
-
(define live-service-dependents
(shepherd-service-back-edges live
#:provision live-service-provision
@@ -546,8 +542,14 @@ (define (shepherd-service-upgrade live target)
(_ #f)))
(define to-restart
- ;; Restart services that are currently running.
- (filter running? target))
+ ;; Restart services that appear in TARGET and are currently running.
+ (filter-map (lambda (service)
+ (and=> (any lookup-live
+ (shepherd-service-provision service))
+ (lambda (live)
+ (and (live-service-running live)
+ live))))
+ target))
(define to-unload
;; Unload services that are no longer required. Essential services must
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm
index d35980590d3..76855b43688 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -214,7 +214,7 @@ (define* (upgrade-shepherd-services eval os)
(let* ((to-unload to-restart
(shepherd-service-upgrade live-services target-services))
(to-unload (map live-service-canonical-name to-unload))
- (to-restart (map shepherd-service-canonical-name to-restart))
+ (to-restart (map live-service-canonical-name to-restart))
(running (map live-service-canonical-name
(filter live-service-running live-services)))
(to-start (lset-difference eqv?
diff --git a/tests/services.scm b/tests/services.scm
index 98b584f6c06..993283047f5 100644
--- a/tests/services.scm
+++ b/tests/services.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015-2019, 2022, 2023 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2015-2019, 2022-2023, 2025 Ludovic Courtès <ludo@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -225,7 +225,7 @@ (define-module (test-services)
(start #t)))))
(lambda (unload restart)
(list (map live-service-provision unload)
- (map shepherd-service-provision restart)))))
+ (map live-service-provision restart)))))
(test-equal "shepherd-service-upgrade: service depended on is not unloaded"
'(((baz)) ;unload
@@ -243,7 +243,7 @@ (define-module (test-services)
(start #t)))))
(lambda (unload restart)
(list (map live-service-provision unload)
- (map shepherd-service-provision restart)))))
+ (map live-service-provision restart)))))
(test-equal "shepherd-service-upgrade: obsolete services that depend on each other"
'(((foo) (bar) (baz)) ;unload
@@ -260,7 +260,7 @@ (define-module (test-services)
(start #t)))))
(lambda (unload restart)
(list (map live-service-provision unload)
- (map shepherd-service-provision restart)))))
+ (map live-service-provision restart)))))
(test-equal "shepherd-service-upgrade: transient service"
;; Transient service must not be unloaded:
@@ -277,7 +277,24 @@ (define-module (test-services)
(start #t)))))
(lambda (unload restart)
(list (map live-service-provision unload)
- (map shepherd-service-provision restart)))))
+ (map live-service-provision restart)))))
+
+(test-equal "shepherd-service-upgrade: service has new canonical name"
+ '(((qux)) ;unload
+ ((ssh) (foo))) ;restart
+ (call-with-values
+ (lambda ()
+ (shepherd-service-upgrade
+ (list (live-service '(ssh) '() #f 42) ;running
+ (live-service '(foo) '() #f #t) ;changed canonical name
+ (live-service '(qux) '() #f #t)) ;obsolete
+ (list (shepherd-service (provision '(ssh))
+ (start #t))
+ (shepherd-service (provision '(bar foo))
+ (start #t)))))
+ (lambda (unload restart)
+ (list (map live-service-provision unload)
+ (map live-service-provision restart)))))
(test-eq "lookup-service-types"
system-service-type
base-commit: 90aa90eb05429553402e0b5225d23f84742a9286
--
2.48.1
Ludovic Courtès <ludo@HIDDEN>:guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN.
Full text available.guix@HIDDEN, dev@HIDDEN, ludo@HIDDEN, othacehe@HIDDEN, zimon.toutoune@HIDDEN, me@HIDDEN, guix-patches@HIDDEN:bug#76502; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.