From patchwork Sat May 3 14:38:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42272 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 16F0327BC4A; Sat, 3 May 2025 15:40:24 +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=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 6671127BC49 for ; Sat, 3 May 2025 15:40:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBE2C-0002jP-LK; Sat, 03 May 2025 10:40:08 -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 1uBE2A-0002hH-IX for guix-patches@gnu.org; Sat, 03 May 2025 10:40:06 -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 1uBE29-00069g-IC; Sat, 03 May 2025 10:40:05 -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=A35hReIphueLp4780qm3YeTXhvPe//rP+T3l7O8fBvw=; b=Yq8pYMWyjglkqRshW00qRjoxrng6vvu9tRqSZhieQymXoqkpb37QFQIP1LvgwkMnoHQfmzv/u8fOD7Qnw/BKaPl8ZNVfiWuwkhVm2uvLunYM1mUKnZFVrvrBZWsFlZEj0BAT0PHbQMMsz0HTZJqWZKd0O4E2BVzp2mUED70SJGR+dnZ00buvtqb18hC3XEnFZ2G4waWRAgjAvVzxMqpaPYYCLKgD2yleKqY1k5vg+HbBa+0b4NH2Ims5QBezg1JO+lL8rpfKEWAUmc7uVl88c6U/tmcru9mzkREvDAqNAJi90lrgBt7OjcLMYep4zicU023xHS0UROxInbC1OCVl8A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBE25-0002oh-KQ; Sat, 03 May 2025 10:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73494] [PATCH v6 1/3] services: activation: Continue on exceptions. References: In-Reply-To: Resent-From: Hilton Chain 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: Sat, 03 May 2025 14:40: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 , 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.174628316210683 (code B ref 73494); Sat, 03 May 2025 14:40:01 +0000 Received: (at 73494) by debbugs.gnu.org; 3 May 2025 14:39:22 +0000 Received: from localhost ([127.0.0.1]:42118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBE1R-0002mE-It for submit@debbugs.gnu.org; Sat, 03 May 2025 10:39:22 -0400 Received: from mail.boiledscript.com ([49.12.134.184]:50612) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBE1O-0002lr-8Y for 73494@debbugs.gnu.org; Sat, 03 May 2025 10:39:19 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1746283156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=A35hReIphueLp4780qm3YeTXhvPe//rP+T3l7O8fBvw=; b=C72TGmQJwnUVmCMYicAOJiNnhdRFSSI3BuUllrsjvGzomIx5v6Qp+A+LoteSsyT/fS96DU YZnqqMLO1EV/m2D/yaanL5fNtsjwrj0PhETsWxUD3nblCDVBQZkuOFdjVh4guSg3O+r5Qn 9tgc6miJQnG2mHx+nffZEhFlgX2HSb2r0mEcn3LWRQgg5uwBMe9knNEKUT5x1XMcWLjDdl hNy8tqBa8Henfw71Y8eaNrYxvGfqjt8gn3yW5AExnwKxKYGqVBygpFnzX/i1GBYGDhtKWK 25GSKmsvfktLA0pG46oedhp3IcnywLqwkAzu6YSPmzj6L+MllKNsHl4OQ9rNzQ== Date: Sat, 3 May 2025 22:38:28 +0800 Message-ID: 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 * gnu/services.scm (activation-script): Reset environment before loading activation script. Catch exception and print the error. Warn about failed activation script. Change-Id: I89be31433fbb46d0c4a9dc6115ab167910840b6f --- gnu/services.scm | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) base-commit: 415e3d98d6faf5fd3d1b7b3daa2f20636e4ff822 prerequisite-patch-id: cb3ac50fb870cf197a4e3ed2ccfb45a6a28400f1 prerequisite-patch-id: 2579801cc89f3e3e022074a0425fba3d38bbe1de prerequisite-patch-id: 7174912f7b05011468bc47b2ba8167b0e617a70b prerequisite-patch-id: 08fa38ca1e61c773052671339b78799f19fb7f60 prerequisite-patch-id: b68df6ad7528101d3fbb1fd44f94472a9c8f4f0a prerequisite-patch-id: 58297e005e4ad0988bd5dc73cd0149637d5c7032 prerequisite-patch-id: 2c09773480fbfd323433986ec528fcb8019273f9 prerequisite-patch-id: e2846320c8b391ff3fec09e51c31578ee6057268 prerequisite-patch-id: 538047ea2f029dd135319c02ba569c4aab9af38d prerequisite-patch-id: 4fb73799b5ea902d69ecf15b72e1fecc9903d0bc prerequisite-patch-id: a3a0146e6686bf6f7804192e1a383239c118717b prerequisite-patch-id: 8de6616d86785be0088bc210202d375b6d0cf5eb prerequisite-patch-id: 2f32dcab8b97a4fd210ab5b29b6ebf327861be36 prerequisite-patch-id: 081be41a50854a1397ad6574d995ba444b927a7f prerequisite-patch-id: 2a631555713d3b74f953673f94877e579045f99c prerequisite-patch-id: b3d778b43f667e73692e1bd8b8945eaf69540fda diff --git a/gnu/services.scm b/gnu/services.scm index 8a4002e072..af054339fd 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -692,15 +692,31 @@ (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)) + ;; TODO: Instead of importing modules here, let users of activation service + ;; add them explicitly. See . + (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) + (srfi srfi-34)) (mkdir-p "/var/run") ;; Make sure the user accounting database exists. If it @@ -720,7 +736,22 @@ (define (activation-script gexps) ;; 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. + (guard (condition + (else + (format (current-error-port) "~a~%" + condition) + (warning + (G_ "failed to activate '~a'~%") + action))) + (save-module-excursion + (lambda () + (set-current-module + (make-fresh-user-module)) + (primitive-load action))))) + '#$actions))))) (define (gexps->activation-gexp gexps) "Return a gexp that runs the activation script containing GEXPS." From patchwork Sat May 3 14:38:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42274 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 5755627BC4B; Sat, 3 May 2025 15:40:25 +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=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 7293727BC49 for ; Sat, 3 May 2025 15:40:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBE2N-0002ll-LM; Sat, 03 May 2025 10:40:19 -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 1uBE2A-0002hM-Ri for guix-patches@gnu.org; Sat, 03 May 2025 10:40:07 -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 1uBE2A-00069t-HX; Sat, 03 May 2025 10:40:06 -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=KP8lDAIMcsizeYgeZgTk67WVPAtf4yakFpsgydngz7w=; b=ALPo1SXAxt1Eo9nIhrlUWzDQiydiwVcBkS+9GZ1tWJxijFpTukshG5a3v3bt3EZLCyiDP0huJS4aFwthH1dWanl0Ia9KT8Vld3XsWKV/sV3IJfDa+QY5bcEfCgK3WhBJY3WRiTvh3FnCaCrdMO2Yy6PumApu3ROguDRXO4kwEH3iQ9Q9eVL0d3iKOabLE/6GZItkrT97YM59eUHu+YqLBV+vZXKkl/iYKhb8WR4ZTsrYOJ39Bz6RFm94K4T8wXwoJN7S9R493KPoM+/QcxQj6JtBftACnDVEn7uwPgqFuQ1MGw0NzRHgw5uGovTckSQASaqkg4FrOMvYihB+/RjqUA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBE26-0002on-2Q; Sat, 03 May 2025 10:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73494] [PATCH v6 2/3] services: cleanup: Bind mount /var/run to /run. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, maxim.cournoyer@gmail.com, ludo@gnu.org, vagrant@debian.org, zhengjunjie@iscas.ac.cn, gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Sat, 03 May 2025 14:40: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 , Gabriel Wicki X-Debbugs-Original-Xcc: Hilton Chain , Maxim Cournoyer , Ludovic =?utf-8?q?Court=C3=A8s?= , Vagrant Cascadian , Z572 , Gabriel Wicki Received: via spool by 73494-submit@debbugs.gnu.org id=B73494.174628316410701 (code B ref 73494); Sat, 03 May 2025 14:40:02 +0000 Received: (at 73494) by debbugs.gnu.org; 3 May 2025 14:39:24 +0000 Received: from localhost ([127.0.0.1]:42121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBE1U-0002mS-4K for submit@debbugs.gnu.org; Sat, 03 May 2025 10:39:24 -0400 Received: from mail.boiledscript.com ([2a01:4f8:242:4aeb::42]:58328) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBE1S-0002m6-4X for 73494@debbugs.gnu.org; Sat, 03 May 2025 10:39:22 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1746283160; 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=KP8lDAIMcsizeYgeZgTk67WVPAtf4yakFpsgydngz7w=; b=Pv+PRLtYjK7ucGCotD4B0bPJ98YnoBxmH7EPx4txi7DjumkH9EvWZLln+BY8lve/NVp+ZB nYJw83UtnJ4dFaD+pDCNc5ltKm6xExgunwlFAD3nHL12CcJx4dzN1tQc53q/FMdB8G9x9+ GRUUdb2uDUkikASl8EWrk9elcIGvPUiJBJrlbIdKTKdTr2CaO7faUXuqL8hLdn1cmOPdWc yVdwNSeivDluBA3PDeRa5kwSeIpaoPSk345BqpQZf0oodkNuJ82RgxnMniXZ9rlpI9tvHv sw25ivjCVZlWkZE+X97zgroRaADJkOJcvXs0HDOW3cMu8jD79Kho8OWFtJlWoQ== Date: Sat, 3 May 2025 22:38:29 +0800 Message-ID: In-Reply-To: References: 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 * 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 0537cae87d..eb8dd39c89 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18383,6 +18383,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 af054339fd..09515a467f 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 76e04bf221..9292172e01 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 4ea8237c70..c75ef39377 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 Sat May 3 14:38:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42273 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 8686A27BC4B; Sat, 3 May 2025 15:40:34 +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=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, 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 42C1127BC49 for ; Sat, 3 May 2025 15:40:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBE2E-0002jY-7v; Sat, 03 May 2025 10:40:12 -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 1uBE2A-0002hI-Op for guix-patches@gnu.org; Sat, 03 May 2025 10:40:06 -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 1uBE2A-00069s-Ea; Sat, 03 May 2025 10:40:06 -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=SnivMKwX4oAX6D86QppmjsudQiGF7Hv9GNhRpl5J8lE=; b=UHCIBSqzbYaNYseKWAq0xqBVTcdD38FORl2haUL3s3h0Y20Qs5LmdwA/VqMXh4q7tRKYsbbnnCMQl7z+3RWCr+H0XJaPmTPWO/30PTHvR7cDgo36FSm8LcC9DyQghQaRyGbq8nLCKFFVecJ11x0FwyYZiH39zcTGlHF55VIfoh0C2rfgVGtIGzt483eAY3YfjYLUEE+eYp8P0y0dCaxWIqYfVSOv8mqkogkuZGUf6pzEHdQN4NQkBHO7LQB9vt9/WwJs3gHdicnpS97nuL6N3ulG1hMl1BtWi+hOniAXETtadVsfqFfa6rQrRjwXe4hpE2BjHdUzPvFLfRUqaVVEjg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBE26-0002ou-HN; Sat, 03 May 2025 10:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73494] [PATCH v6 3/3] WIP: Fix jami-provisioning test. Resent-From: Hilton Chain 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: Sat, 03 May 2025 14:40: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.174628316810721 (code B ref 73494); Sat, 03 May 2025 14:40:02 +0000 Received: (at 73494) by debbugs.gnu.org; 3 May 2025 14:39:28 +0000 Received: from localhost ([127.0.0.1]:42124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBE1Y-0002mr-0N for submit@debbugs.gnu.org; Sat, 03 May 2025 10:39:28 -0400 Received: from mail.boiledscript.com ([2a01:4f8:242:4aeb::42]:58332) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBE1V-0002mW-3Q for 73494@debbugs.gnu.org; Sat, 03 May 2025 10:39:25 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1746283163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SnivMKwX4oAX6D86QppmjsudQiGF7Hv9GNhRpl5J8lE=; b=PzCVJQryzmjUrYj3uStJPeKY68XgoGgr+zEo/epn/p4cEmd5OSxmLUP0kdXIzfquOvDBXo VIBbFE/dUEIiS3CYckycBbpGSlHJ1FEUYWy2M9/eyRGjuiIL7luftRl4Xxp8/zLW5cOmRL jYZCT4SnzvgtPbw1C4tgwkTt0DXKmJ07G/IZ1sOeQyL9F8+1cNPaQhpJ4b5OtCLelvg0R8 vu2SeR4xEe3K35KGShQs7PcGWCq/3YXz3XTduMZRi38NPprWeRSfvIvJhxDkHX0uo1n79n 9H2uG6x4mCLpXFXMVDBIDOpJL4MaGHv0TBykFqamGAJL7iwEtmgGPA8U2Vgqfw== Date: Sat, 3 May 2025 22:38:30 +0800 Message-ID: <51d0b0c2cb1bc7ad70ac1b35f1b9c2a72047b39a.1746283044.git.hako@ultrarare.space> In-Reply-To: References: 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 f03ea963f7..219cb42164 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))))