From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id MJ78AgII9WaV1QAAe85BDQ:P1 (envelope-from ) for ; Thu, 26 Sep 2024 07:06:42 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id MJ78AgII9WaV1QAAe85BDQ (envelope-from ) for ; Thu, 26 Sep 2024 09:06:42 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=E7++NpOi; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=kRbfh0Gc; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1727334402; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=nClfNoWWXK7aIuSy56LXRhmr7QMEWyW0hyV2TaoNQmA=; b=VI5ul1ADQo0rfqAxc9fp6/9r5JYcts7uoBdvbk2xjZrD4EppVq01UdmtTCY/0/oC63KnTM OptP8cUupEB/UG1iOxOllJMAvfHhawkPKOFJBP+AEV8DuPGO3hBhFJOPveAxRzIJLaJxlJ fmhbGvgvUWI/vsyN6n19DyuNRcdAzEJtLqMGFcomlMaHqAVmdovWKPea1hvXAVFMYyF5yZ 2b8+v/HTaVeyidcf/LsXi0Y8QgdEQbSKlE2BHB8xC+nyPwhLxfZ/qIhAUDakEPTN8OolYb QRnSLAewHszYBs91WPhL37HPMNXWKfcyXscM8nZHGB3TfDHeaQ5dHBSp4KCKIw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727334402; a=rsa-sha256; cv=none; b=Ud4XgCpVIEBVsGoyuCtf2R8jPdFHMmdkwFi9DWL2Cf709ho4miq9UQdfaZfia4vSPBNF/g q5XpdTVugxWeubbirlTSYMFkws/PG+6u92tDD3B2En7YjmQIQK7rmwFgwZ1ZdwR+g/qvPN UmettT0+zqlmYH18NIlnXFUuu6ISVN2vlnMokXYZIvPN/pUER06EYXK+mUaU7MFhJRMbN9 Yq1rbIfZix7rVoeaUMLY+EIaQECGJfk4ZxMpy6bXlddY3sc6LJ8DVrbFlJ84Xyvn5+dLE4 30zI8UJ8kAvNJXfBFWs4B5tKaklMDWF+KXr3eY+rBSx5SOjVYHaD9Z6Ju+YngQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=E7++NpOi; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=kRbfh0Gc; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7CC937BB0B for ; Thu, 26 Sep 2024 09:06:41 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stiaE-0004eU-LT; Thu, 26 Sep 2024 03:06:38 -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 1stiaC-0004dh-Gp for guix-patches@gnu.org; Thu, 26 Sep 2024 03:06:36 -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 1stiaB-0001O4-Ff; Thu, 26 Sep 2024 03:06:35 -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=nClfNoWWXK7aIuSy56LXRhmr7QMEWyW0hyV2TaoNQmA=; b=E7++NpOiqR+tU44AnVM3fHW7i5+CvSWIEj/QwPxwFowum9lW8oy3HxyyUxaEJMwX/uPhk8UtrzgniX8GhR57zPB1ODKn4JNm69rwI3KpX9kOpF4YyNe3M3uTViPEQU28AeBICH3u1ZdODY9le3v7Pc/0nQ0RV4oVoq7odgkPDbHXmHeTS1/2MUCVi/+cxL6ro8MRmPCMBp/tC8/MwGEYAO+7/ds6WTOyVsYaC35L7lx5r/xG1hMjoVpeRmBDSpc0hPIAtwRgZM+1sklqvEZSNxclCSd/apobi1H/k5fIJguwfD8tNA885QwBf1wdhV8eJT0c9CCCNVLQcail0N7m8g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stiac-0007pl-5K; Thu, 26 Sep 2024 03:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73494] [PATCH 1/2] file-systems: %base-file-systems: Add tmpfs /run. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 07:07: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 , Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 73494-submit@debbugs.gnu.org id=B73494.172733439530031 (code B ref 73494); Thu, 26 Sep 2024 07:07:02 +0000 Received: (at 73494) by debbugs.gnu.org; 26 Sep 2024 07:06:35 +0000 Received: from localhost ([127.0.0.1]:48520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stiaB-0007oJ-2W for submit@debbugs.gnu.org; Thu, 26 Sep 2024 03:06:35 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:59252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stia8-0007no-UX for 73494@debbugs.gnu.org; Thu, 26 Sep 2024 03:06:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1727334359; 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=nClfNoWWXK7aIuSy56LXRhmr7QMEWyW0hyV2TaoNQmA=; b=kRbfh0GcL/tjS/yFb5RMlUpovAw9+9RXodGF5Vsru5HeCB7axPwY0j+1y9quI1wjlvzmMS 0hZn0cObX/vxAD+o10tZFJT7pEirWqLRAylKA1PtWl3+ZpRGUNb0SMMb7Q3eieZCh0juw+ qt5nVW+AA5YNzoyA6cS9FUfcR5vqvvoddjKOkJ1hQhjCJD3zZHtl5tkiNB5j1EZtI5ADUx t8Ll/oU4W/nKyKE8uUzr+HCrUHpOa2+/aG9WWLGuDpXIiUkmSqjWjiT2OAmPIsMQ8kndcZ OygnlQjCJ6KCEf8p74nmt0e90u3IzhlFR66oTjq7kH+jZOHprihtY0RmvwKKlg== Date: Thu, 26 Sep 2024 15:05:28 +0800 Message-ID: <9769cf0f812d5e7e9fe38ed664809974101821e0.1727334105.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ----- 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -5.02 X-Migadu-Queue-Id: 7CC937BB0B X-Spam-Score: -5.02 X-TUID: 0Qs9S9YrjT44 * gnu/system/file-systems (%runtime-variable-data): New variable. (%base-file-systems): Add it. * doc/guix.texi (File Systems): Document it. * gnu/services.scm (cleanup-gexp): Adjust accordingly. Change-Id: I3a95e49d396fbb2577026aefc247cfe996c5f267 --- doc/guix.texi | 5 +++++ gnu/services.scm | 5 +---- gnu/system/file-systems.scm | 15 ++++++++++++++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 52e36e4354..54edd14d1b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17988,6 +17988,11 @@ 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. +@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 8a4002e072..ea855ad193 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -632,7 +632,7 @@ (define (cleanup-gexp _) #~(begin (use-modules (guix build utils)) - ;; Clean out /tmp, /var/run, and /run. + ;; Clean out /tmp and /var/run. ;; ;; XXX This needs to happen before service activations, so it ;; has to be here, but this also implicitly assumes that /tmp @@ -663,15 +663,12 @@ (define (cleanup-gexp _) (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)))))) (define cleanup-service-type diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 4ea8237c70..65704d7681 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -82,6 +82,7 @@ (define-module (gnu system file-systems) %pseudo-terminal-file-system %tty-gid %immutable-store + %runtime-variable-data %control-groups %elogind-file-systems @@ -448,6 +449,17 @@ (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") + (flags '(no-dev strict-atime)) + (options "mode=0755,nr_inodes=800k,size=20%") + (needed-for-boot? #t) + (check? #f) + (create-mount-point? #t))) + (define %control-groups ;; The cgroup2 file system. (list (file-system @@ -497,7 +509,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. base-commit: 8576aaf5f90db9b385ea8cf6dc98bf3c062959dc -- 2.46.0