From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YHuFIYCX3GRfAgEASxT56A (envelope-from ) for ; Wed, 16 Aug 2023 11:31:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id oAFgIYCX3GQ2UAAA9RJhRA (envelope-from ) for ; Wed, 16 Aug 2023 11:31:44 +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 0CA2E530ED for ; Wed, 16 Aug 2023 11:31:44 +0200 (CEST) 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=1692178304; 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=qCn0igGaq2JSCHePJwDIXWMDhqIHto0x1n+SVdwFfK4lcKsuoWKVn9KGFJ0tB+mBARPEFP KyKmw6IQqNFNGruV+dROPPV6sgyIA9XREuNThZbdTobRwaAvOnzcSfSgQs6mrTPHgg5lwz wKVSbmovbmJL8gxwHAqvk5acKpx4i0NPRLJ32nU7fU7CrjNCHUwlx95BsFYGSXWJN30CMz S1g8tcIaWkGMplNfaiOGSxFLNi2euXCLVDhpXATwXInaKgxBVg00hRilqR11OCYKO0mXzZ ihOLYYL/4D+AqWn9bNoM8kQtSgPOKfChBzi69t2oUJJhR7ouVvBj2Yd/6AM/Rg== 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=1692178304; a=rsa-sha256; cv=none; b=RwBarpdCDYipr2A3qFfPZ/52N3AlnCszIpwtYwcBS2ZQ2gNMBQBBzk1bDeefdboPv+E29Y 8tEugGo/LeNn/xdYQW0aXg/X9+wEK8vnuoTa1BRbNg3jAC8P7N+4x0UnxJTVKtzIoFeL+V X9GNhM3ZS6yHP4VdAmFxJ8MwM1tGpbajzfzevMS21rkrRp7UazOURhw7kfmYKFF5lJafSZ vid79q2vSyQZV2A8yjzns/HsaTkQRSQqQah1rT3qcHly1FMvAqbBPGWAOWtiNpiU3GmXV0 gs4JYU/DjqBymPJJh93z5zDNWbeEvX5m85wZ+ZwY2DzOjoPmnjq0u3Ub2QThKg== 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 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 Content-Transfer-Encoding: 8bit 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 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-Spam-Score: -6.19 X-Migadu-Queue-Id: 0CA2E530ED X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -6.19 X-TUID: uPfS/onB4Czx --- 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