From patchwork Sun Feb 4 02:19:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 22789 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 4731827BBEB; Sun, 4 Feb 2024 02:21:09 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 15B5D27BBE9 for ; Sun, 4 Feb 2024 02:21:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWS7p-0006MU-FV; Sat, 03 Feb 2024 21:20:53 -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 1rWS7m-0006Lr-VT for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:51 -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 1rWS7m-0004Au-L0 for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWS7y-0006aO-1S for guix-patches@gnu.org; Sat, 03 Feb 2024 21:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH v3 1/5] gnu: build: file-systems: Extend tmpfs fallback. References: In-Reply-To: Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 02:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65335@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.170701323025222 (code B ref 65335); Sun, 04 Feb 2024 02:21:02 +0000 Received: (at 65335) by debbugs.gnu.org; 4 Feb 2024 02:20:30 +0000 Received: from localhost ([127.0.0.1]:47364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7R-0006Yj-UK for submit@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:30 -0500 Received: from 8.mo583.mail-out.ovh.net ([178.32.116.78]:42025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7N-0006YI-CR for 65335@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:28 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.2.235]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 02CB028209 for <65335@debbugs.gnu.org>; Sun, 4 Feb 2024 02:20:11 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-krmn9 (unknown [10.110.113.27]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7FB341FD86; Sun, 4 Feb 2024 02:20:11 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-krmn9 with ESMTPSA id xjbYF1v0vmWhngAA2JHyhw (envelope-from ); Sun, 04 Feb 2024 02:20:11 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R0049254cd7b-48f8-4658-af9a-92827fe38b15, CDD90146079FDB87F723A7A7FD21F5F4569C6C59) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sun, 4 Feb 2024 03:19:53 +0100 Message-ID: <20240204022004.2785-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 17607667170554929885 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfedujedggeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeetveehffevvdfgtddthedvhfeguefggeffteetueeliedvhffhjeegudehleegheenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/build/file-systems (canonicalize-device-name): Fallback to tmpfs if spec is "none". Change-Id: Ia55c715d04c7611ba8c979f23f1ad4a8ed2e75b6 --- gnu/build/file-systems.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 36a59f5f5c..78d779f398 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 David C. Trudgian ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2022 Oleg Pykhalov +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -1021,8 +1022,8 @@ (define find-partition-by-luks-uuid (define (canonicalize-device-spec spec) "Return the device name corresponding to SPEC, which can be a , a -, or a string (typically a /dev file name or an nfs-root -containing ':/')." +, the string 'none' or another string (typically a /dev +file name or an nfs-root containing ':/')." (define max-trials ;; Number of times we retry partition label resolution, 1 second per ;; trial. Note: somebody reported a delay of 16 seconds (!) before their @@ -1046,8 +1047,8 @@ (define (resolve find-partition spec fmt) (match spec ((? string?) - (if (string-contains spec ":/") - spec ; do not resolve NFS devices + (if (or (string-contains spec ":/") (string=? spec "none")) + spec ; do not resolve NFS / tmpfs devices ;; Nothing to do, but wait until SPEC shows up. (resolve identity spec identity))) ((? file-system-label?) From patchwork Sun Feb 4 02:19:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 22790 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 1D68327BBEB; Sun, 4 Feb 2024 02:21:11 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 91EC227BBEA for ; Sun, 4 Feb 2024 02:21:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWS7p-0006MZ-Go; Sat, 03 Feb 2024 21:20:53 -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 1rWS7n-0006Lz-Ks for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:52 -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 1rWS7n-0004Aw-2J for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:51 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWS7y-0006aX-Ey for guix-patches@gnu.org; Sat, 03 Feb 2024 21:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH v3 2/5] gnu: services: Ensure /var/run existence in activation-script. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 02:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65335@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.170701323025236 (code B ref 65335); Sun, 04 Feb 2024 02:21:02 +0000 Received: (at 65335) by debbugs.gnu.org; 4 Feb 2024 02:20:30 +0000 Received: from localhost ([127.0.0.1]:47366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7S-0006Yl-CF for submit@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:30 -0500 Received: from 2.mo576.mail-out.ovh.net ([178.33.251.80]:39165) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7O-0006YK-Pw for 65335@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:28 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.17.245]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 245ED30FCD for <65335@debbugs.gnu.org>; Sun, 4 Feb 2024 02:20:13 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-64d6d (unknown [10.110.113.27]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 747DD1FD29; Sun, 4 Feb 2024 02:20:12 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-64d6d with ESMTPSA id qZ8SH1z0vmXcEgoADV1rBw (envelope-from ); Sun, 04 Feb 2024 02:20:12 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G005bc25c3ee-ee2e-4035-b4c7-376f3e0e0cbc, CDD90146079FDB87F723A7A7FD21F5F4569C6C59) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sun, 4 Feb 2024 03:19:54 +0100 Message-ID: <20240204022004.2785-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240204022004.2785-1-ngraves@ngraves.fr> References: <20240204022004.2785-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17607948644155187933 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfedujedggeejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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): Ensure /var/run existence. * gnu/build/install.scm (evaluate-populate-directive) [directives]: Remove directory /var/run. Change-Id: I5fb93d33b6b1f045f1e5ba206b9b0b74b5184260 --- gnu/build/install.scm | 2 +- gnu/services.scm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/build/install.scm b/gnu/build/install.scm index d4982650c1..618a51af8e 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013-2020, 2022 Ludovic Courtès ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -134,7 +135,6 @@ (define (directives store) (directory "/var/guix/gcroots") (directory "/var/empty") ; for no-login accounts (directory "/var/db") ; for dhclient, etc. - (directory "/var/run") (directory "/run") (directory "/mnt") (directory "/var/guix/profiles/per-user/root" 0 0) diff --git a/gnu/services.scm b/gnu/services.scm index 23c3d8a9f4..59481af10f 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2023 Brian Cully +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -692,6 +693,7 @@ (define actions (use-modules (gnu build activation) (guix build utils)) + (mkdir-p "/var/run") ;; Make sure the user accounting database exists. If it ;; does not exist, 'setutxent' does not create it and ;; thus there is no accounting at all. From patchwork Sun Feb 4 02:19:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 22793 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 8D0B427BBEB; Sun, 4 Feb 2024 02:21:30 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 1A38D27BBE9 for ; Sun, 4 Feb 2024 02:21:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWS7r-0006NQ-Gt; Sat, 03 Feb 2024 21:20:55 -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 1rWS7n-0006M0-L3 for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:52 -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 1rWS7n-0004B2-7T for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:51 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWS7y-0006ae-Rz for guix-patches@gnu.org; Sat, 03 Feb 2024 21:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH v3 3/5] gnu: build: activation: Ensure /run existence. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 02:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65335@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.170701323125242 (code B ref 65335); Sun, 04 Feb 2024 02:21:02 +0000 Received: (at 65335) by debbugs.gnu.org; 4 Feb 2024 02:20:31 +0000 Received: from localhost ([127.0.0.1]:47369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7S-0006Yz-SB for submit@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:31 -0500 Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:60703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7Q-0006YM-Bn for 65335@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:29 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.176.211]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id E710A269E5 for <65335@debbugs.gnu.org>; Sun, 4 Feb 2024 02:20:14 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-xfz5d (unknown [10.108.42.247]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8D0821FD59; Sun, 4 Feb 2024 02:20:13 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-xfz5d with ESMTPSA id Lw0BKV30vmVmEgkA0jpIEA (envelope-from ); Sun, 04 Feb 2024 02:20:13 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G001f9a2a8f3-ec74-48d2-9645-34bb15f8f0dd, CDD90146079FDB87F723A7A7FD21F5F4569C6C59) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sun, 4 Feb 2024 03:19:55 +0100 Message-ID: <20240204022004.2785-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240204022004.2785-1-ngraves@ngraves.fr> References: <20240204022004.2785-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17608511593401934557 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfedujedggeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheeffeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/build/activation.scm (activation-script): Ensure /var/run existence. * gnu/build/install.scm (evaluate-populate-directive) [directives]: Remove directory /run. Change-Id: I19ca8e7605c0cff598ab89077a94e20390ba27b0 --- gnu/build/activation.scm | 2 ++ gnu/build/install.scm | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index eea2233563..d8c0cd22a3 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -408,6 +409,7 @@ (define* (activate-current-system (format #t "making '~a' the current system...~%" system) + (mkdir-p "/run") ;; Atomically make SYSTEM current. (let ((new (string-append %current-system ".new"))) (symlink system new) diff --git a/gnu/build/install.scm b/gnu/build/install.scm index 618a51af8e..0aa227b4d8 100644 --- a/gnu/build/install.scm +++ b/gnu/build/install.scm @@ -135,7 +135,6 @@ (define (directives store) (directory "/var/guix/gcroots") (directory "/var/empty") ; for no-login accounts (directory "/var/db") ; for dhclient, etc. - (directory "/run") (directory "/mnt") (directory "/var/guix/profiles/per-user/root" 0 0) From patchwork Sun Feb 4 02:19:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 22791 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 1699B27BBEB; Sun, 4 Feb 2024 02:21:20 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 7C92027BBE9 for ; Sun, 4 Feb 2024 02:21:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWS7r-0006N8-1D; Sat, 03 Feb 2024 21:20:55 -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 1rWS7o-0006ME-AC for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:52 -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 1rWS7n-0004BB-Kd for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWS7z-0006am-9A for guix-patches@gnu.org; Sat, 03 Feb 2024 21:21:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH v3 4/5] gnu: system: bootable-kernel-arguments: Extend tmpfs fallback. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 02:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65335@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.170701323325253 (code B ref 65335); Sun, 04 Feb 2024 02:21:03 +0000 Received: (at 65335) by debbugs.gnu.org; 4 Feb 2024 02:20:33 +0000 Received: from localhost ([127.0.0.1]:47371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7U-0006ZC-LK for submit@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:33 -0500 Received: from 13.mo581.mail-out.ovh.net ([87.98.150.175]:38271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7R-0006YU-BF for 65335@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:30 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.17.245]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 1FFEF26A91 for <65335@debbugs.gnu.org>; Sun, 4 Feb 2024 02:20:16 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-dt286 (unknown [10.111.174.42]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C3C591FE0E; Sun, 4 Feb 2024 02:20:15 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-dt286 with ESMTPSA id nTa6KF/0vmUMawAA8jytNA (envelope-from ); Sun, 04 Feb 2024 02:20:15 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004fbf59db4-cc92-4d0f-9c71-2ef19c7bbdd0, CDD90146079FDB87F723A7A7FD21F5F4569C6C59) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sun, 4 Feb 2024 03:19:56 +0100 Message-ID: <20240204022004.2785-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240204022004.2785-1-ngraves@ngraves.fr> References: <20240204022004.2785-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17609074546024047325 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfedujedggeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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.scm (bootable-kernel-arguments): Fallback to tmpfs if root is "none". Change-Id: I35a656e71169dc786e5256d98a3c04c65043086d --- gnu/system.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 3cd64a5c9f..aede35775e 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 raid5atemyhomework ;;; Copyright © 2023 Bruno Victal +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -197,15 +198,18 @@ (define* (bootable-kernel-arguments system root-device version) ;; compatibility when producing bootloader configurations for older ;; generations. (define version>0? (> version 0)) - (list (string-append (if version>0? "root=" "--root=") - ;; Note: Always use the DCE format because that's what - ;; (gnu build linux-boot) expects for the 'root' - ;; kernel command-line option. - (file-system-device->string root-device - #:uuid-type 'dce)) - #~(string-append (if #$version>0? "gnu.system=" "--system=") #$system) - #~(string-append (if #$version>0? "gnu.load=" "--load=") - #$system "/boot"))) + (let ((root (file-system-device->string root-device + #:uuid-type 'dce))) + (append + (if (string=? root "none") + '() ; Ignore the case where the root is "none" (typically tmpfs). + ;; Note: Always use the DCE format because that's what + ;; (gnu build linux-boot) expects for the 'root' + ;; kernel command-line option. + (list (string-append (if version>0? "root=" "--root=") root))) + (list #~(string-append (if #$version>0? "gnu.system=" "--system=") #$system) + #~(string-append (if #$version>0? "gnu.load=" "--load=") + #$system "/boot"))))) ;; System-wide configuration. From patchwork Sun Feb 4 02:19:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 22792 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 88E3B27BBEB; Sun, 4 Feb 2024 02:21:26 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 1A45F27BBE9 for ; Sun, 4 Feb 2024 02:21:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWS7s-0006Nf-NZ; Sat, 03 Feb 2024 21:20:56 -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 1rWS7o-0006MF-AO for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:52 -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 1rWS7o-0004BC-1J for guix-patches@gnu.org; Sat, 03 Feb 2024 21:20:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWS7z-0006av-MD for guix-patches@gnu.org; Sat, 03 Feb 2024 21:21:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH v3 5/5] gnu: home: symlink-manager: Allow busy device skip. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Feb 2024 02:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65335 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65335@debbugs.gnu.org Cc: ludo@gnu.org, ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.170701323525267 (code B ref 65335); Sun, 04 Feb 2024 02:21:03 +0000 Received: (at 65335) by debbugs.gnu.org; 4 Feb 2024 02:20:35 +0000 Received: from localhost ([127.0.0.1]:47373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7X-0006ZT-2I for submit@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:35 -0500 Received: from 2.mo581.mail-out.ovh.net ([87.98.143.68]:51065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWS7S-0006Yi-DF for 65335@debbugs.gnu.org; Sat, 03 Feb 2024 21:20:33 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.2.235]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 89B3026DBE for <65335@debbugs.gnu.org>; Sun, 4 Feb 2024 02:20:17 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-7bbx8 (unknown [10.110.178.109]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4372D1FD86; Sun, 4 Feb 2024 02:20:17 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-7bbx8 with ESMTPSA id q7n5DWH0vmXPiAMAhd4O0w (envelope-from ); Sun, 04 Feb 2024 02:20:17 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S0026c223a19-ae90-437a-acae-6d81dfa849df, CDD90146079FDB87F723A7A7FD21F5F4569C6C59) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Sun, 4 Feb 2024 03:19:57 +0100 Message-ID: <20240204022004.2785-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240204022004.2785-1-ngraves@ngraves.fr> References: <20240204022004.2785-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17609356018216198877 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 17 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfedujedggeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucgfrhhlucfvnfffucdludejmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/home/services/symlink-manager.scm (update-symlinks-script): Allow busy device skip. Change-Id: Iff91c8a30309d25c02a8311d8d5ddbf54e90f5ad --- gnu/home/services/symlink-manager.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/home/services/symlink-manager.scm b/gnu/home/services/symlink-manager.scm index e4c931fbee..560e03a839 100644 --- a/gnu/home/services/symlink-manager.scm +++ b/gnu/home/services/symlink-manager.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Andrew Tropin ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2022 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -157,6 +158,12 @@ (define (strip file) #t (G_ "Skipping ~a (not an empty directory)... done\n") directory)) + ;; This happens when the directory is a mounted device. + ((= EBUSY errno) + (format + #t + (G_ "Skipping ~a (underlying device is busy)... done\n") + directory)) ((= ENOENT errno) #t) ((= ENOTDIR errno) #t) (else