From patchwork Tue Apr 29 07:17:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42132 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 CA3B327BC4A; Tue, 29 Apr 2025 08:20:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 8C92227BC49 for ; Tue, 29 Apr 2025 08:20:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9fG4-0008Ol-Hg; Tue, 29 Apr 2025 03:20:02 -0400 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 1u9fFC-0008I7-5V for guix-patches@gnu.org; Tue, 29 Apr 2025 03:19:22 -0400 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 1u9fFA-0004sF-0R; Tue, 29 Apr 2025 03:19:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=Eyfe1YI2mIOVWjgmSEgA1PXm1vkqddx825qOEpXQNV0=; b=pj2JSplBWrhcdSY17jTcLOp8e6HsLjDNDt2bv6akCJYYDEVCh30aigIJIUlQDLdKhZAKghQ4bj/W/WKhbjMnCn01wKe9QMFlPrTwjBGsLNMOSoEm20U30+fhmNhGIXqljLGvBImV/AkHPzUyb74KyyzKorEIOSS2Qe5Xyr2YO777zQdTTq/NPWEQOoPg5hhc0r4INM0foGKTsCHuKw6Dk3n0d5ByFRzegw28AxpfWcn7bfgP4Skc2oY2BBY5RVuQ2/ptWtxRHvxTj7itn4oh9Z293auARiuaSVQqM3U1ZAnuiHqrM7Hz+MpksZt4CBqzStHbleqhXucz7aunJSGhGw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9fF7-00007O-Nf; Tue, 29 Apr 2025 03:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73494] [PATCH v4 1/3] services: activation: Continue on exceptions. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, maxim.cournoyer@gmail.com, ludo@gnu.org, vagrant@debian.org, zhengjunjie@iscas.ac.cn, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 07:19:01 +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 , Maxim Cournoyer , Hilton Chain , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian , Z572 X-Debbugs-Original-Xcc: Hilton Chain , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian , Z572 Received: via spool by 73494-submit@debbugs.gnu.org id=B73494.174591110832678 (code B ref 73494); Tue, 29 Apr 2025 07:19:01 +0000 Received: (at 73494) by debbugs.gnu.org; 29 Apr 2025 07:18:28 +0000 Received: from localhost ([127.0.0.1]:47028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9fEa-0008Uz-1o for submit@debbugs.gnu.org; Tue, 29 Apr 2025 03:18:28 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:52658) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9fEU-0008TC-PK for 73494@debbugs.gnu.org; Tue, 29 Apr 2025 03:18:26 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-223fd89d036so70092125ad.1 for <73494@debbugs.gnu.org>; Tue, 29 Apr 2025 00:18:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745911095; x=1746515895; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Eyfe1YI2mIOVWjgmSEgA1PXm1vkqddx825qOEpXQNV0=; b=b/4lVeENZRi9a6D6a9lwYVmeCvxQBwrsAtJQWI5A0/RXubvBVvc4HYP+fr/SMDWrBg UpvMqImwU/4GmxvLtC60HRJ0sNikSBhxdZ0f0li/IID2jQBYOjr/FL7IxiEAonKajhM+ 8Jx411bOmfzBgn5kjuRAnLYO+Bj/Z0YLkftw/tM69O8Qo7tXcRPR8rIIE6+jM5fbOmyG grMzEx06UqkkE0Jo04QI/JujiekcWJsajuaHEC9gxIwiu8aRn5FVZt+QA8NyrHTelGQe 9bboHmXRZ25ab2ernM73E0j5SjbBmzCEdH7xAvnuG0hIkpdDsmBf+azf+AVHfgCP9G4c vn2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745911095; x=1746515895; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Eyfe1YI2mIOVWjgmSEgA1PXm1vkqddx825qOEpXQNV0=; b=Hv0GKXh6lZPgYTNHw2j+Hx3scaNw8LN1F/78G9CTBGx3iRfDwbEA7TRgfJysgtj9Sc 3I6T+QR80QVidE20Yxr8dGf18x9aubVGvOlfT3kSeF4GxuCyMPxOl4JJUtY3cAN4Y4wk FN+fOKGz9L7S20qh3nyJPZHi/deHesitmdjb0kWwugPFjLxczcxVjikrmnP0sk03GWsY pE64HBRptQ2jammD8rBKU2aJPo+jqzSsGAXUjaj+piB6ztWsxLiv2qrSTSfVtaqxDc4Y SC1HVbfdw6pteZDKVqJy/G6NrWluFlKUKlz+7eA6WbHcLVC0QTDqiU4519FknWbu/VUv 96DA== X-Gm-Message-State: AOJu0YzJJEnaAEcraTNhBaIlbiCZCnGza8doObbqrJ9D5SrSImM3zXqk jlNI7QA3cQoxNo6m+OjkDzkrP+zpFRxe8RaVr2IlDRCNMZCmNBuhkUbyGA== X-Gm-Gg: ASbGncv2ojXH2wWkLVqiBLkSrHhG5NEotLUQVF/KSdbdUmQvp5A09ZgdSvrSL5LSJ0n uts4MlvHkVrJzAIA/J/iJ4gO4c6jwGewT3TqGQ8N9f4cwJ9RlQUvDgTqaZZ8bt2VeJBqmyPHP+o vw2/tzbn4PR32y3YrBbgXWwwHCTyU+0XNnO2wN9Wy4HaBwgQvenSGzkVJhXRg0m7pT921Sfwc4q WnP4Exk/qTzkJVyYq3MBlTQNZ21sbcCQpPxxvt2C7Z6Sy8iyUmOAEwy9ulus36h9AQFlF6wYlQO CrdoLxNxHl9SiCZ7RXd4LAXmnN94imubv9oYGa1q6ySeCgy1b2f0a0RaVYpt X-Google-Smtp-Source: AGHT+IFRfFf4dakQhyoNsUljwFjPZptVIHKRl7nlO97TS6dwWuy5zXg8ordoJ8a48OhZZ1pKsnF+BA== X-Received: by 2002:a17:903:2a86:b0:224:1221:1ab4 with SMTP id d9443c01a7336-22dc6a095ccmr214022165ad.22.1745911095287; Tue, 29 Apr 2025 00:18:15 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d76f4bsm95399495ad.49.2025.04.29.00.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 00:18:14 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 29 Apr 2025 16:17:43 +0900 Message-ID: <597361035150296c6051f6f78fc8cc8ff3af8b61.1745911065.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 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 From: Hilton Chain 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 Signed-off-by: Maxim Cournoyer --- gnu/services.scm | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) base-commit: 2b4680c6c17bd6470f78a1f39d2f7af8b05e279f diff --git a/gnu/services.scm b/gnu/services.scm index 8a4002e0724..ed17981ffdd 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -692,15 +692,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 @@ -719,8 +732,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." From patchwork Tue Apr 29 07:17:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42134 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 C6EAF27BC4B; Tue, 29 Apr 2025 08:20:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,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 1806327BC49 for ; Tue, 29 Apr 2025 08:20:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9fGR-00005W-M3; Tue, 29 Apr 2025 03:20:29 -0400 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 1u9fFD-0008IB-Mt for guix-patches@gnu.org; Tue, 29 Apr 2025 03:19:25 -0400 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 1u9fFC-0004sV-I9; Tue, 29 Apr 2025 03:19:07 -0400 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=NnwFb4SwueYZqVnITeYzLBrkzbN5D9MX3frq+axuH7c=; b=ihrCEoiy6uqJTTAXlJhbRVI+na1y3ciMe7GQ/QdnSaB/u6jCZ0l1AUTM4Gg3YEgMD7HorW3K9pFYsJDHCl0kOBF+U7/HLCy4MVxQrMHxkGG+eYoT8p6dgq2AaIemL97rsJbCP4ivF44ABCl1VMx84YNehsHGL4d5nMtJj48M7B0yTUC16DKoK2U+n5jFL7b+FXriGN5N0AYRIFiZnQmlvJ0hS54zJRLsUU+Ypp7ov13j/7XY5RQk4gNp8lvpGNQ7MnwnTJbuiAnI38LiM10orKCnytBq65xaNu9oW/fHRRFLgbdvt/gqOYk9wEU9ll2OI8tggvl7kIl8hY3rKKHPVw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9fF8-00007Y-7O; Tue, 29 Apr 2025 03:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73494] [PATCH v4 2/3] services: cleanup: Bind mount /var/run to /run. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, maxim.cournoyer@gmail.com, ludo@gnu.org, vagrant@debian.org, zhengjunjie@iscas.ac.cn, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 07:19:02 +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 , Maxim Cournoyer , Hilton Chain , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian , Z572 X-Debbugs-Original-Xcc: Hilton Chain , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian , Z572 Received: via spool by 73494-submit@debbugs.gnu.org id=B73494.174591111232697 (code B ref 73494); Tue, 29 Apr 2025 07:19:02 +0000 Received: (at 73494) by debbugs.gnu.org; 29 Apr 2025 07:18:32 +0000 Received: from localhost ([127.0.0.1]:47032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9fEe-0008VH-3d for submit@debbugs.gnu.org; Tue, 29 Apr 2025 03:18:32 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:50345) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9fEX-0008TV-EF for 73494@debbugs.gnu.org; Tue, 29 Apr 2025 03:18:27 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22c33e5013aso67244685ad.0 for <73494@debbugs.gnu.org>; Tue, 29 Apr 2025 00:18:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745911099; x=1746515899; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NnwFb4SwueYZqVnITeYzLBrkzbN5D9MX3frq+axuH7c=; b=WG6keXPAQQ+6FDOwupjt9J3i7Ku3kJKdAPKw001xiPasQ2OgU8h7NOTLNxjYUUw3sL hye0rqZsLK1BB2iqpUSmnhcJaGmGFvZV12tGIZjaOZy0W2bMaqaiasur7yueObljlhmX yslAeSkh+T+tL5e8yphWe8iiZ2ri+HSrHPer04nywjKgM69Tma7xrIAmjho2BFwImbwa awhE6rVdJRkhB1sY4tqA8WTKoeEMgktrawQ6RF43DFn19sXZmlnvPfTZs3NOQgBdK73M FtA9WorWXj8VLwkt3Vkd+YTL/htRdvW4TxQa1Kghq9UxcHe3CijhfuptpyjHp+cCyX8F iijA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745911099; x=1746515899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NnwFb4SwueYZqVnITeYzLBrkzbN5D9MX3frq+axuH7c=; b=uJBgHnBa8r7m1T+IXgWH2Zthil434v0DAG2M33bjyo01PtUfCMkC83Fly/YBkxSgnk GLd0YJWSaCjdguS+1S8bJLc8p2OWacITOpgVIABoY5iv0bVAWpf53z8wRiPD6ake1/vY ozjzi0phZ2dpCHomXJ7hwd4vbuBW2t3qeoVChFXKwq2nvJ1IQCvIacLhpDURWaVXU5gc S5q9tugF5zS/PmMRwnj1htKkAhSJdLArWPWPPWr2vkKLirzTmK2QxBy3xKgIo2myrjvX g99VTqbPtZh5TezlB7miaoZmSTp/F9DmiP0aKDww/eWIvmKrfAho45KbFNZFtNjjgcms XJsw== X-Gm-Message-State: AOJu0Ywtoe1rZEiS5q3vthbng0QawwG94WXTQbgPkYseyDrFDjLsiwxE Kb57thCnOOpttUlxjynobbz0KucXnICcovQwPbuzFy7RZSlFqpcATLINLQ== X-Gm-Gg: ASbGnct/aVPvJ7QJeGspPLHzSD/4+kW2zvdX2cw9I4B201wQnY8OnXXR6k0cCZ/rIDH s7Aagiz0Jcxtey9dEikDXjljb9UV05/OILqy2DzK0m9ZFZlCtX0wuqaUmgVvGLPHUDO63kmPKJ2 adlGSbAVKBJ41aGz5gzHyJybAOvQMbhi0E/C9N+xFCLYaVMYl+GL2KGzZpc9Tk8to0nnZDDe6BK TOzVTHi2E02f4+JZ6RAUPWvPc3U8tIRDYVDlIQE28b8iWpJN8vQ/kpQuKW48AajIi+ehXD84ORr saA5Xrohm+F+xvLHW4kWKv8g6mKSrrh0Wj+YG+0yOLAyzs6VIl+LqEBESsoW X-Google-Smtp-Source: AGHT+IERKDigj1RlG5mbgLn2K6DjAy9GeI1AuKtgbaiYluKXh7dNDAXVCFkR2xHoT2/veq6PG6gYGQ== X-Received: by 2002:a17:903:1aab:b0:216:53fa:634f with SMTP id d9443c01a7336-22dc6a8977cmr193501125ad.48.1745911098643; Tue, 29 Apr 2025 00:18:18 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d76f4bsm95399495ad.49.2025.04.29.00.18.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 00:18:17 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 29 Apr 2025 16:17:44 +0900 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <597361035150296c6051f6f78fc8cc8ff3af8b61.1745911065.git.maxim.cournoyer@gmail.com> References: <597361035150296c6051f6f78fc8cc8ff3af8b61.1745911065.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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 From: Hilton Chain * gnu/system/file-systems.scm (%runtime-variable-data) (%runtime-variable-data/bind-mount): New variables. * gnu/system/file-systems.scm (%base-file-systems): Register %runtime-variable-data. * gnu/services.scm (cleanup-gexp): Bind mount /var/run to /run. Remove now extraneous cleanups. * doc/guix.texi (File Systems): Document it. Change-Id: Ie462347935569acddfba68441cf58815a5087cff Modified-by: Maxim Cournoyer --- doc/guix.texi | 7 +++++++ gnu/services.scm | 21 +++++++++++++-------- gnu/services/dbus.scm | 31 ------------------------------- gnu/system/file-systems.scm | 29 +++++++++++++++++++++++++++-- 4 files changed, 47 insertions(+), 41 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7b418a40892..7c8903dcdf7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18379,6 +18379,13 @@ File Systems read-write in its own ``name space.'' @end defvar +@defvar %runtime-variable-data +This file system is mounted as @file{/run} and contains system +information data describing the system since it was booted. +@file{/var/run} is bind mounted to @file{/run}, for backward +compatibility. +@end defvar + @defvar %binary-format-file-system The @code{binfmt_misc} file system, which allows handling of arbitrary executable file types to be delegated to user space. This requires the diff --git a/gnu/services.scm b/gnu/services.scm index ed17981ffdd..e07b3c24626 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -628,9 +628,14 @@ (define (system-provenance system) (define (cleanup-gexp _) "Return a gexp to clean up /tmp and similar places upon boot." - (with-imported-modules '((guix build utils)) + (with-imported-modules (source-module-closure + '((guix build utils) + (gnu build file-systems) + (gnu system file-systems))) #~(begin - (use-modules (guix build utils)) + (use-modules (guix build utils) + (gnu build file-systems) + (gnu system file-systems)) ;; Clean out /tmp, /var/run, and /run. ;; @@ -662,17 +667,17 @@ (define (cleanup-gexp _) "/lib/locale")) (setlocale LC_CTYPE "en_US.utf8") (delete-file-recursively "/tmp") - (delete-file-recursively "/var/run") - (delete-file-recursively "/run") ;; Note: The second argument to 'mkdir' is and'ed with umask, ;; hence the 'chmod' calls. (mkdir "/tmp" #o1777) (chmod "/tmp" #o1777) - (mkdir "/var/run" #o755) - (chmod "/var/run" #o755) - (mkdir "/run" #o755) - (chmod "/var/run" #o755)))))) + + ;; XXX: It'd be cleaner if we could simply register + ;; %runtime-variable-data/bind-mount in %base-file-systems, that + ;; fails with: 'statfs-raw: No such file or directory' when + ;; checking for "/run". + (mount-file-system %runtime-variable-data/bind-mount #:root "/")))))) (define cleanup-service-type ;; Service that cleans things up in /tmp and similar. diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 76e04bf2215..9292172e01a 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -190,37 +190,6 @@ (define (dbus-activation config) ;; world-readable. (mkdir-p/perms "/run/dbus" user #o755)) - (catch 'system-error - (lambda () - (symlink "/run/dbus" "/var/run/dbus")) - (lambda args - (let ((errno (system-error-errno args))) - (cond - ((= errno EEXIST) - (let ((existing-name - (false-if-exception - (readlink "/var/run/dbus")))) - (unless (equal? existing-name "/run/dbus") - ;; Move the content of /var/run/dbus to /run/dbus, and - ;; retry. - (let ((dir (opendir "/var/run/dbus"))) - (let loop ((next (readdir dir))) - (cond - ((eof-object? next) (closedir dir)) - ((member next '("." "..")) (loop (readdir dir))) - (else - (begin - (rename-file (string-append "/var/run/dbus/" next) - (string-append "/run/dbus/" next)) - (loop (readdir dir))))))) - (rmdir "/var/run/dbus") - (symlink "/run/dbus" "/var/run/dbus")))) - (else - (format (current-error-port) - "Failed to symlink /run/dbus to /var/run/dbus: ~s~%" - (strerror errno)) - (error "cannot create /var/run/dbus")))))) - (unless (file-exists? "/etc/machine-id") (format #t "creating /etc/machine-id...~%") (invoke (string-append #$(dbus-configuration-dbus config) diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 4ea8237c70d..c75ef39377f 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013-2022 Ludovic Courtès ;;; Copyright © 2020 Google LLC ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020, 2021 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2025 Maxim Cournoyer ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2022 Oleg Pykhalov ;;; @@ -82,6 +82,8 @@ (define-module (gnu system file-systems) %pseudo-terminal-file-system %tty-gid %immutable-store + %runtime-variable-data + %runtime-variable-data/bind-mount %control-groups %elogind-file-systems @@ -448,6 +450,28 @@ (define %immutable-store (check? #f) (flags '(read-only bind-mount no-atime)))) +(define %runtime-variable-data + (file-system + (type "tmpfs") + (mount-point "/run") + (device "tmpfs") + ;; Don't use no-suid here as /run/privileged/bin may contain SUID + ;; executables. + (flags '(no-dev strict-atime)) + (options "mode=0755,nr_inodes=800k,size=20%") + (needed-for-boot? #t) + (check? #f) + (create-mount-point? #t))) + +(define %runtime-variable-data/bind-mount + (file-system + (device "/run") + (mount-point "/var/run") + (type "tmpfs") + (flags '(bind-mount)) + (check? #f) + (create-mount-point? #t))) + (define %control-groups ;; The cgroup2 file system. (list (file-system @@ -497,7 +521,8 @@ (define %base-file-systems %debug-file-system %shared-memory-file-system %efivars-file-system - %immutable-store)) + %immutable-store + %runtime-variable-data)) (define %base-live-file-systems ;; This is the bare minimum to use live file-systems. From patchwork Tue Apr 29 07:17:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42133 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 6C55B27BC4B; Tue, 29 Apr 2025 08:20:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,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 004CC27BC49 for ; Tue, 29 Apr 2025 08:20:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9fG0-0008Np-Cc; Tue, 29 Apr 2025 03:19:57 -0400 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 1u9fFD-0008IA-Hl for guix-patches@gnu.org; Tue, 29 Apr 2025 03:19:25 -0400 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 1u9fFC-0004sW-Ju; Tue, 29 Apr 2025 03:19:07 -0400 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=HUHzk6qlaLHDtYw2JU9kk+MvMI8WIE0d5Re5Z6OswmU=; b=oearTL9GJEHl8dV+2lffskg9esMhb8qdFmp+LHSnB8BKP8R3TqSVKnZm/KkyC3LqzhcBMEcUZ/Zfb+yIaFEMdsn+gn9Zpx3LDg/vz/iIE7/WLZEBSasRYFlkNI93NTgPgfnGyO/DiFJM6+LcdBsdvBReuS5QHpRsCBPlbe6dwzMGOMl11V/WMYAwQPZdYgkt1fyF6R+LvprxtCVg4r50+7vrKqYkJzWQwSYIhRwdtDbynzD+xGbh0pIc7xIik4xYQ7c0GNswSL50vmFX3NyOidJO45OGpiLnl651dhxbv+Ced9oRu616WsZBWeJdEiJj0Qy+Hi9USCgchtJPVbQ3zw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9fF8-00007f-NG; Tue, 29 Apr 2025 03:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73494] [PATCH v4 3/3] WIP: Fix jami-provisioning test. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, maxim.cournoyer@gmail.com, ludo@gnu.org, vagrant@debian.org, zhengjunjie@iscas.ac.cn, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 07:19:02 +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: Zheng Junjie , Maxim Cournoyer , Hilton Chain , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian , Z572 X-Debbugs-Original-Xcc: Hilton Chain , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian , Z572 Received: via spool by 73494-submit@debbugs.gnu.org id=B73494.174591111332704 (code B ref 73494); Tue, 29 Apr 2025 07:19:02 +0000 Received: (at 73494) by debbugs.gnu.org; 29 Apr 2025 07:18:33 +0000 Received: from localhost ([127.0.0.1]:47034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9fEe-0008VK-Qc for submit@debbugs.gnu.org; Tue, 29 Apr 2025 03:18:33 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:52296) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9fEa-0008UB-DK for 73494@debbugs.gnu.org; Tue, 29 Apr 2025 03:18:29 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-227c7e57da2so47859015ad.0 for <73494@debbugs.gnu.org>; Tue, 29 Apr 2025 00:18:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745911102; x=1746515902; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HUHzk6qlaLHDtYw2JU9kk+MvMI8WIE0d5Re5Z6OswmU=; b=eHzvAlvcSVCF9dDrGhVfiHV9OxpWYXVCujqxvm8EVa6A9RJPgI1b1ojH1OGQlygAS+ C+duFdKPeiMn7Gx2EHQ10fyX6IASOhn+OO+e6o+g1qzUDoxweyJJ9HPEX/Wuk7MQ6l8b P2NFQp6RPn4OfiYA3hIuvbLkORzTRs1tWgKagwa9Yg6R0Te2h63VfOqW0HWz5DeyzopC Vz4mQOFr94ZvhcynEC6kqbY/aKme0iwo8OyZkNf+0baS86YBV5xUalWjzaSxMluDp9GG oUtX9KR0WJE1V1R/z+3J3Sst3hdoXWnVN3IvYNSUl4vCXHBqN4AkzNDY0W9McucZIWZT V7EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745911102; x=1746515902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HUHzk6qlaLHDtYw2JU9kk+MvMI8WIE0d5Re5Z6OswmU=; b=WH6AJKmWiuIilB/kAv2v7ETmp1gWHT9eQH2wHrOKH3LNuKm/jrlbycTwY87ViUXBkY Tohbk437dMnY3X1Hg18OeAqTYEGDJGVcOQBukFWAwfEf98DTlOxcBdrMzZ46RZo66S0Y vtfYL7Xf9nJ5FNSrNg17zW+HySguKAU71Z8gjSz9lav2f1xWAEeAzX/QgkkLaKScYNt2 eWbTYodDTKgENTkeF4Y5wFE0OjDlyhJQi+0tcduZgjucyhIcG0d/DxuFnH+k5g0FEto3 ixT0tfidjin6yOuHlyjhFTPqU4MBBTnu4unJ5bkZ7QaW6CI2QoF1WJZocCxYcZzexGCU 9ncA== X-Gm-Message-State: AOJu0YwbTbshzYLoVaB09ExbD5yKXerf8Ds4SIzccZa4RT5c+9X46Hv2 J/tP2EnS20d+Ci+xaaSDtNz5rqgZa6oMXEvITKaGkrukLYx6Rtr6PzVutA== X-Gm-Gg: ASbGncstflm7GmKTpnM7kFuJQ2dAB2YzUMjuQAkRZZNXAICYFSqSrEbveA6D9tlwXNi vVjyoQzqZbScuZlvtI1qXLyfksFkBnzEyj6pl4phh4yQVt2dIHfdyIEarawnxB1qiyv+WWIFUDY iPgJbfSaXcW/Zrrm/47eDCzJS9od9E2yM7CIc1DgAe1beiHsueCuWKeen27qdGB+62CBKyTxONq rJ9+dSax3GiPaowZNZCxCfqBWVRKIG3ozpBbCdiNmt5UXvL3RMlQVbxpyXSPWMzFTm1dx9ZO78M DSRNVVFjuj2lN3n70cmu+XMgvVxU1coLXoWw+2ruDYCdD5O+uKc+s3I/3CEd X-Google-Smtp-Source: AGHT+IHKUR8qKZunCdCRf0sDn2y7PFDgaQowTdnDvhdqwfaAQ18VgudOAkxr27lO8Ql2soM22ap1Pw== X-Received: by 2002:a17:902:d491:b0:223:4341:a994 with SMTP id d9443c01a7336-22dc69efa2bmr171221015ad.9.1745911101972; Tue, 29 Apr 2025 00:18:21 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d76f4bsm95399495ad.49.2025.04.29.00.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 00:18:21 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 29 Apr 2025 16:17:45 +0900 Message-ID: <7c7e983d742f74cece3bf87fe6e593947dc58a8f.1745911065.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <597361035150296c6051f6f78fc8cc8ff3af8b61.1745911065.git.maxim.cournoyer@gmail.com> References: <597361035150296c6051f6f78fc8cc8ff3af8b61.1745911065.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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 From: Zheng Junjie TODO: Investigate why this is needed. Do not commit. Change-Id: I6996b5627d732d1c261ae453da5d0916637b0288 Signed-off-by: Maxim Cournoyer --- gnu/tests/telephony.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/tests/telephony.scm b/gnu/tests/telephony.scm index f03ea963f7e..219cb421647 100644 --- a/gnu/tests/telephony.scm +++ b/gnu/tests/telephony.scm @@ -30,6 +30,7 @@ (define-module (gnu tests telephony) #:use-module (gnu services telephony) #:use-module (guix gexp) #:use-module (guix modules) + #:use-module (gnu services shepherd) #:export (%test-jami %test-jami-provisioning %test-jami-provisioning-partial)) @@ -116,7 +117,9 @@ (define* (make-jami-os #:key provisioning? partial?) (openssh-configuration (permit-root-login #t) (allow-empty-passwords? #t))) - %base-services)) + (service syslog-service-type) + (modify-services %base-services + (delete shepherd-system-log-service-type)))) (packages (cons* (specification->package "recutils") (specification->package "strace") %base-packages))))