From patchwork Wed Aug 16 09:29:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 52879 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 400F127BBEA; Wed, 16 Aug 2023 10:30:43 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 9CBB327BBE2 for ; Wed, 16 Aug 2023 10:30:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWCrK-0001Ym-4c; Wed, 16 Aug 2023 05:30:35 -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 1qWCqo-0001T7-Tq for guix-patches@gnu.org; Wed, 16 Aug 2023 05:30:05 -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 1qWCqo-0000aC-Ko for guix-patches@gnu.org; Wed, 16 Aug 2023 05:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWCqo-0006Jl-El for guix-patches@gnu.org; Wed, 16 Aug 2023 05:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH 1/4] file-systems: canonicalize-device-name: Ignore the "none" case. References: In-Reply-To: Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 09:30: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: ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.169217819724249 (code B ref 65335); Wed, 16 Aug 2023 09:30:02 +0000 Received: (at 65335) by debbugs.gnu.org; 16 Aug 2023 09:29:57 +0000 Received: from localhost ([127.0.0.1]:38845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCqi-0006J2-KN for submit@debbugs.gnu.org; Wed, 16 Aug 2023 05:29:56 -0400 Received: from 4.mo581.mail-out.ovh.net ([178.32.122.254]:43701) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCqg-0006Is-FV for 65335@debbugs.gnu.org; Wed, 16 Aug 2023 05:29:55 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.138.83]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 43F2E26ECB for <65335@debbugs.gnu.org>; Wed, 16 Aug 2023 09:29:53 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-fwpb5 (unknown [10.111.208.172]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id EB2C51FDDB; Wed, 16 Aug 2023 09:29:52 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-fwpb5 with ESMTPSA id 7GxGMhCX3GSZWQMAFOcv1w (envelope-from ); Wed, 16 Aug 2023 09:29:52 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G0022bc3d26e-6c6f-4f20-85a7-fd8561f8a645, EFC9AD881B11E31D841027839B6E0A93490164A7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 16 Aug 2023 11:29:26 +0200 Message-ID: <344951a96d504fb86db43c79262739f5a7c086bb.1692178169.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 10885481777719075554 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedruddtledgudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: 1a92b3f43c280f143b00f8bb95a173fb85e52664 diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 36a59f5f5c..e39bd31c3b 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -1021,8 +1021,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 +1046,8 @@ (define (canonicalize-device-spec spec) (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 Wed Aug 16 09:29:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 52881 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 E0D9827BBE2; Wed, 16 Aug 2023 10:31:59 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 9DBE427BBE9 for ; Wed, 16 Aug 2023 10:31:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWCsD-0001sp-DT; Wed, 16 Aug 2023 05:31: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 1qWCrm-0001lg-Qe for guix-patches@gnu.org; Wed, 16 Aug 2023 05:31:09 -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 1qWCrm-0000u5-I7 for guix-patches@gnu.org; Wed, 16 Aug 2023 05:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWCrm-0006Ns-E4 for guix-patches@gnu.org; Wed, 16 Aug 2023 05:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH 2/4] gnu: services: activation-script: Ensure /var/run existence. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 09:31: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: ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.169217820524343 (code B ref 65335); Wed, 16 Aug 2023 09:31:02 +0000 Received: (at 65335) by debbugs.gnu.org; 16 Aug 2023 09:30:05 +0000 Received: from localhost ([127.0.0.1]:38851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCqq-0006KW-Ur for submit@debbugs.gnu.org; Wed, 16 Aug 2023 05:30:05 -0400 Received: from 5.mo583.mail-out.ovh.net ([87.98.173.103]:59745) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCql-0006JD-BQ for 65335@debbugs.gnu.org; Wed, 16 Aug 2023 05:30:03 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.16.160]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 149FC2606F for <65335@debbugs.gnu.org>; Wed, 16 Aug 2023 09:29:58 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-tskzz (unknown [10.108.16.92]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 53B0D1FDBA; Wed, 16 Aug 2023 09:29:57 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-6684bf9d7b-tskzz with ESMTPSA id n1IBEBWX3GTYHR0A3bk/bA (envelope-from ); Wed, 16 Aug 2023 09:29:57 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-110S004e55bdc77-c0bc-4503-88b2-d82bcf9db364, EFC9AD881B11E31D841027839B6E0A93490164A7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 16 Aug 2023 11:29:27 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <344951a96d504fb86db43c79262739f5a7c086bb.1692178169.git.ngraves@ngraves.fr> References: <344951a96d504fb86db43c79262739f5a7c086bb.1692178169.git.ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 10886607677632340706 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedruddtledgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdduuddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheeffeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/services.scm b/gnu/services.scm index 109e050a23..a992800796 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -670,6 +670,7 @@ (define (activation-script gexps) ;; 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. + (mkdir-p "/var/run") (close-port (open-file "/var/run/utmpx" "a0")) ;; Same for 'wtmp', which is populated by mingetty et From patchwork Wed Aug 16 09:29:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 52882 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 DA08227BBEA; Wed, 16 Aug 2023 10:32:10 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 C6DCF27BBE9 for ; Wed, 16 Aug 2023 10:32:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWCs8-0001qt-IM; Wed, 16 Aug 2023 05:31:24 -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 1qWCrn-0001lx-Hb for guix-patches@gnu.org; Wed, 16 Aug 2023 05:31:11 -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 1qWCrn-0000uI-8l for guix-patches@gnu.org; Wed, 16 Aug 2023 05:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWCrn-0006O6-4k for guix-patches@gnu.org; Wed, 16 Aug 2023 05:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH 3/4] gnu: build: activate-current-system: Ensure directory existence. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 09:31: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: ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.169217820624357 (code B ref 65335); Wed, 16 Aug 2023 09:31:03 +0000 Received: (at 65335) by debbugs.gnu.org; 16 Aug 2023 09:30:06 +0000 Received: from localhost ([127.0.0.1]:38855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCqr-0006Kh-PY for submit@debbugs.gnu.org; Wed, 16 Aug 2023 05:30:06 -0400 Received: from 12.mo584.mail-out.ovh.net ([178.33.104.253]:46663) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCqm-0006JF-5v for 65335@debbugs.gnu.org; Wed, 16 Aug 2023 05:30:04 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.109.146.20]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id D32FA2725B for <65335@debbugs.gnu.org>; Wed, 16 Aug 2023 09:29:58 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zmhk6 (unknown [10.110.171.1]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 73C7F1FEB1; Wed, 16 Aug 2023 09:29:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-zmhk6 with ESMTPSA id 6Om1GRaX3GTNlB8AU2QudA (envelope-from ); Wed, 16 Aug 2023 09:29:58 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G004af822114-97ee-4c82-b6d6-43c2db073bfc, EFC9AD881B11E31D841027839B6E0A93490164A7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 16 Aug 2023 11:29:28 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <344951a96d504fb86db43c79262739f5a7c086bb.1692178169.git.ngraves@ngraves.fr> References: <344951a96d504fb86db43c79262739f5a7c086bb.1692178169.git.ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 10886889151285682914 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedruddtledgudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheeffeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index eea2233563..759704ae03 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -408,6 +408,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) From patchwork Wed Aug 16 09:29:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 52880 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 7CBE427BBEA; Wed, 16 Aug 2023 10:31:45 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 0BF1127BBE2 for ; Wed, 16 Aug 2023 10:31:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWCsA-0001rd-8M; Wed, 16 Aug 2023 05:31:26 -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 1qWCrn-0001lr-8u for guix-patches@gnu.org; Wed, 16 Aug 2023 05:31:10 -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 1qWCrm-0000uC-TT for guix-patches@gnu.org; Wed, 16 Aug 2023 05:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWCrm-0006Nz-PQ for guix-patches@gnu.org; Wed, 16 Aug 2023 05:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH 4/4] gnu: system: bootable-kernel-arguments: Ignore the "none" root case. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 09:31: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: ngraves@ngraves.fr Received: via spool by 65335-submit@debbugs.gnu.org id=B65335.169217820524351 (code B ref 65335); Wed, 16 Aug 2023 09:31:02 +0000 Received: (at 65335) by debbugs.gnu.org; 16 Aug 2023 09:30:05 +0000 Received: from localhost ([127.0.0.1]:38853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCqr-0006Ka-BP for submit@debbugs.gnu.org; Wed, 16 Aug 2023 05:30:05 -0400 Received: from 5.mo560.mail-out.ovh.net ([87.98.181.248]:43401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCqn-0006JH-6n for 65335@debbugs.gnu.org; Wed, 16 Aug 2023 05:30:04 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.138.245]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 11C762653C for <65335@debbugs.gnu.org>; Wed, 16 Aug 2023 09:30:00 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-c6p2s (unknown [10.110.208.213]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 997141FE07; Wed, 16 Aug 2023 09:29:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-c6p2s with ESMTPSA id N4B+IBeX3GRBjQEAkda6lA (envelope-from ); Wed, 16 Aug 2023 09:29:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G002b60ea96c-644b-48f3-8541-1e22398e8b13, EFC9AD881B11E31D841027839B6E0A93490164A7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 16 Aug 2023 11:29:29 +0200 Message-ID: <8a425542b975f8c38457c4c12ed7c86d0df56325.1692178169.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <344951a96d504fb86db43c79262739f5a7c086bb.1692178169.git.ngraves@ngraves.fr> References: <344951a96d504fb86db43c79262739f5a7c086bb.1692178169.git.ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 10887170625114333922 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedruddtledgudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehfeefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 279b9df5c0..0d9e9ee5cf 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -198,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.