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 ms8.migadu.com with LMTPS id yHx0N5/0vmVMfwAAe85BDQ:P1 (envelope-from ) for ; Sun, 04 Feb 2024 03:21:20 +0100 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 yHx0N5/0vmVMfwAAe85BDQ (envelope-from ) for ; Sun, 04 Feb 2024 03:21:20 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707013279; 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-type:content-type: 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; bh=E67GPicAp73DwaAQBVDxkuuZQrpfVXaE8KGgovQZ0QU=; b=XMkp/D1cb0OaUrq3Mf1wOGVOQjC8gPYOzDW34Yx2IKE9EO84bL5qwF/QT7Gp7DQeMnq1D1 gHLDWUXb5BmwWD1vKjFksfRaRpIAtT2OVjPkBJL4iobyhfGoAaOmcctmfvQJ9zuefbXPgL GFqdpQO1bS/GwxhHUy6rE4Au/fKTIoawn5VKT0kQFeVYLvomWj8RAhgku2331INneyBpkU Fk2aYEyS7LS+0nqQ9Z2IF+9RPfH209gDIsi1ZvL5wuKlB/ZN8Rizi72vXWr7t+GemGKEOc 0QlseJN6+9fCxvJyvg6+dIj/Ox8eO8JhyIurJDDK57+E2bQEaQbbe7emPJ0AyQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707013279; a=rsa-sha256; cv=none; b=LMQz3Wf10RYxILbAbzozDdni3WIQfdiWyu6Es968OFo9nu362s42GbWDVkqnvvBa+Y2M3e JUGh4e+/FkD23GX1hHAnn9lrQuomED3EYCKASUsKp2CE3EkgLzCryjTDl1gJuLfAOSjTbT c4ysPJm4q/LUcjBsAkQ5oUvlSpd9ZlbAKpbsFEaufp9kAmm38nEKIk8aFP42tL4lFXvDvV eQREBCTJRGoTes+iH6qn0KIPzdjvkl5n+f0M0/hbpeeW5iPoyDrqq5W+Gocue0SfUJSRtY MFr7Px5PTxZBvWZlrWxbTRRGosLLp93y4aSBT6RkDpfcLmZghanm80DYdSacmw== 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 CB31311AD6 for ; Sun, 4 Feb 2024 03:21:19 +0100 (CET) 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 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: Nicolas Graves 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-Spam-Score: -7.17 X-Spam-Score: -7.17 X-Migadu-Queue-Id: CB31311AD6 X-Migadu-Scanner: mx12.migadu.com X-TUID: peMEm6foTz8i * 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. -- 2.41.0