From patchwork Thu Mar 6 06:22:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 39721 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 978BF27BBEA; Thu, 6 Mar 2025 06:24:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2142227BBE2 for ; Thu, 6 Mar 2025 06:24:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tq4eO-0000iW-Dm; Thu, 06 Mar 2025 01:24:09 -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 ) id 1tq4eL-0000Z9-J9 for guix-patches@gnu.org; Thu, 06 Mar 2025 01:24:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tq4eJ-0004J8-Vm; Thu, 06 Mar 2025 01:24:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=P3mvAwJunBrnjKMclNXpGdabxdtITDWXuNcI0K+g+OU=; b=q9/3w7RR+KMMd6mw1MAlbBRN24xUnbYYkObU0MJv5gn5MUv8x0LKpQtHd42GfNzpJWRc98qaxzNb9MVz42GLQBITNWNNGTJHkU9jRaBATjigBuWTxBkqUo2RfZ08id8U5GtBCjxaF4JtgV+ZLPS4SEDyR4rT9SF6GyUVVz9Y4y7vooAnCik54B7bbMyW8hC0mzX7SQPy1ZEFEbsSKKY0Nc2tFPyCKXm83DVsF8qi1eHInW/gOTODupprv2+EdGmCp6qClolXfBFDk+6tM/TgloZVx5Rm2DxhMRMyVahXo2HXyAHe9UhI1wZAD44ZphCXAB2Tu1GpK5FCVDJlIOoZ9A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tq4eJ-0002dQ-OV; Thu, 06 Mar 2025 01:24:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73494] [PATCH v3 3/3] services: activation: Continue on exceptions. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, maxim.cournoyer@gmail.com, ludo@gnu.org, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Thu, 06 Mar 2025 06:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73494 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73494@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian X-Debbugs-Original-Xcc: Hilton Chain , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian Received: via spool by 73494-submit@debbugs.gnu.org id=B73494.174124221010044 (code B ref 73494); Thu, 06 Mar 2025 06:24:03 +0000 Received: (at 73494) by debbugs.gnu.org; 6 Mar 2025 06:23:30 +0000 Received: from localhost ([127.0.0.1]:41014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tq4dl-0002bt-PJ for submit@debbugs.gnu.org; Thu, 06 Mar 2025 01:23:30 -0500 Received: from mx.boiledscript.com ([88.99.243.112]:37260) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tq4dj-0002be-Ek for 73494@debbugs.gnu.org; Thu, 06 Mar 2025 01:23:27 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1741242206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P3mvAwJunBrnjKMclNXpGdabxdtITDWXuNcI0K+g+OU=; b=BThbFg9yZy7AcZzQA1sYsEl1g5zZo1xJ5sLa5UnK2jCPK8KTmvKchWbz6o7pklQhK99iAF NsMdV4dnZbMdsa6PTApWrs+9iUc8a3F+qwo7BBpqqmUaAi+pSMes47G/paIS4Nk27DT5W5 0I6y2BwDGzZJRzG6ij2CE3/rdZn77klOOQWrqfW/GkfQH7bYgu/SFzPDERD2194gpUtZZg vetrmjBwOdmWjOLENpOL4wIA8lORrqH0JNHlmFruk/9thYSLl/ohfQ8nTrdFUq+22uDCTW hW1mihqbytj//2+nvw5NkzqDICC6WfNirVQD8W5uqgUieTYy8jWg8cVVCuZ+SA== Date: Thu, 6 Mar 2025 14:22:44 +0800 Message-ID: <18ba6d18420c9ac93dcdab6b349e1050d6ca3a6a.1741241800.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 X-MS-Reactions: disallow 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Use ‘invoke’ for backtraces and avoid changing environment. * gnu/services.scm (activation-script): Execute activation scripts in ‘invoke’. Warn about failed activation scripts. Change-Id: I89be31433fbb46d0c4a9dc6115ab167910840b6f --- gnu/services.scm | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 7805cae971..3a511a42e5 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -690,15 +690,28 @@ (define* (activation-service->script service) (define (activation-script gexps) "Return the system's activation script, which evaluates GEXPS." (define actions - (map (cut program-file "activate-service.scm" <>) gexps)) + (map (lambda (action) + (program-file "activate-service.scm" + (with-imported-modules (source-module-closure + '((gnu build activation) + (guix build utils))) + #~(begin + (use-modules (gnu build activation) + (guix build utils)) + #$action)))) + gexps)) (program-file "activate.scm" (with-imported-modules (source-module-closure '((gnu build activation) - (guix build utils))) + (guix build utils) + (guix diagnostics) + (guix i18n))) #~(begin (use-modules (gnu build activation) - (guix build utils)) + (guix build utils) + (guix diagnostics) + (guix i18n)) (mkdir-p "/var/run") ;; Make sure the user accounting database exists. If it @@ -717,8 +730,17 @@ (define (activation-script gexps) (activate-current-system) ;; Run the services' activation snippets. - ;; TODO: Use 'load-compiled'. - (for-each primitive-load '#$actions))))) + (for-each (lambda (action) + ;; Don't block activation process when one + ;; action fails. + (catch #t + (lambda () + (invoke action)) + (lambda _ + (warning + (G_ "failed to activate '~a'.~%") + action)))) + '#$actions))))) (define (gexps->activation-gexp gexps) "Return a gexp that runs the activation script containing GEXPS."