From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WHW7CCyR4mQ2FQAASxT56A (envelope-from ) for ; Mon, 21 Aug 2023 00:18:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iHHqByyR4mT0fAEAauVa8A (envelope-from ) for ; Mon, 21 Aug 2023 00:18:20 +0200 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 AC28038BB3 for ; Mon, 21 Aug 2023 00:18:19 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; 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=1692569899; 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; bh=+YTUijGdOCnJHVe2FreYB7bhvmLc4kM1/1VrMISo63I=; b=O4NOpqL3pwbuOduG/Sz/fbHs2p/SE7/rk10fGqZYSc2g3UY5dCfXyGsAVxPmQcFftHkQoA OIxN8Tz5f6D2hniAwdAcY+Ns3YtXUukOEsKc046piURlwRGFjPG1cdsvyFIDcii1xIR8fY GE+N1hYA0PJYPTXuuQSn4gVVmJX2Gy3wfNNqiYoE3ISR/dFCZzccTpjxtO7BU5mAN9K1Dx pcr5ktvIuuyvw2C3F8Tbh3CNU/qmcpKn+qaAmmwDdOBmFUbC79Yo3ONKq7B/OBDF+icCZT w8pebWteY8F29IQB6uTTqq17xWmS3X2rjUXgxUrFJz8gVBgohewDPcrisfl4gw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692569899; a=rsa-sha256; cv=none; b=YY8RaVzMugt8YFQf8ixiXibXmx0Cb8zdn56fdzG2c4Q7Oy6P0N2fVpKaBXqLolBbZ1dfp1 jFoaM4m9C0cIvyFgRnlNUI19/ByxZEH7jUoIoBTzFZr/XR48It+tIJgpfJ2rG0QUgCMjIh 0AWC5SUVPNkw28baqLtpJHWpGVlyZA1Kf4oXQZ22gybsog1jYdwh1JRe57VZvatFuPAq5s Uz88e6JLYhPQXWxSsVWBxhHQGuSpOV2NcuU2AFgSheOp+QBkYU5KVHando/MJ/10w9mkzX u2V1NWipo8IqQhnYFuafQuyNJjLL5AswSfvgC0S0orvjjIZP8NnmQfVQPuwoyg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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 localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXqkF-00042L-Kz; Sun, 20 Aug 2023 18:18:03 -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 1qXqkD-00041J-Ua for guix-patches@gnu.org; Sun, 20 Aug 2023 18:18:01 -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 1qXqkD-00018w-Mh for guix-patches@gnu.org; Sun, 20 Aug 2023 18:18:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXqkF-0003YA-G7 for guix-patches@gnu.org; Sun, 20 Aug 2023 18:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65335] [PATCH v2 4/5] 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: Sun, 20 Aug 2023 22:18: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.169256983113558 (code B ref 65335); Sun, 20 Aug 2023 22:18:03 +0000 Received: (at 65335) by debbugs.gnu.org; 20 Aug 2023 22:17:11 +0000 Received: from localhost ([127.0.0.1]:55030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXqjP-0003WW-AZ for submit@debbugs.gnu.org; Sun, 20 Aug 2023 18:17:11 -0400 Received: from 9.mo576.mail-out.ovh.net ([46.105.56.78]:34085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXqjK-0003Vm-PQ for 65335@debbugs.gnu.org; Sun, 20 Aug 2023 18:17:07 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.143.18]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id A462323E08 for <65335@debbugs.gnu.org>; Sun, 20 Aug 2023 22:17:03 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-jxmcb (unknown [10.110.103.53]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 32AA01FD67; Sun, 20 Aug 2023 22:17:03 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-jxmcb with ESMTPSA id 1rTICN+Q4mSp8BgA/EIQng (envelope-from ); Sun, 20 Aug 2023 22:17:03 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Mon, 21 Aug 2023 00:16:46 +0200 Message-ID: <52095319ac7aefa59a081b87fd8609811a5e1cd2.1692569807.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 10439062464678257378 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedruddukedgtdekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheeffeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth 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: -6.20 X-Spam-Score: -6.20 X-Migadu-Queue-Id: AC28038BB3 X-Migadu-Scanner: mx1.migadu.com X-TUID: WHYTHS1RcWr1 --- 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. -- 2.41.0