unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 65335@debbugs.gnu.org
Cc: ludo@gnu.org, ngraves@ngraves.fr
Subject: [bug#65335] [PATCH v3 4/5] gnu: system: bootable-kernel-arguments: Extend tmpfs fallback.
Date: Sun,  4 Feb 2024 03:19:56 +0100	[thread overview]
Message-ID: <20240204022004.2785-4-ngraves@ngraves.fr> (raw)
In-Reply-To: <20240204022004.2785-1-ngraves@ngraves.fr>

* 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 <maximedevos@telenet.be>
 ;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
 ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
 ;;;
 ;;; 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





  parent reply	other threads:[~2024-02-04  2:21 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-16  9:24 [bug#65335] [PATCH 0/4] Allow mounting root on tmpfs for impersistence Nicolas Graves via Guix-patches via
2023-08-16  9:29 ` [bug#65335] [PATCH 1/4] file-systems: canonicalize-device-name: Ignore the "none" case Nicolas Graves via Guix-patches via
2023-08-16  9:29   ` [bug#65335] [PATCH 2/4] gnu: services: activation-script: Ensure /var/run existence Nicolas Graves via Guix-patches via
2023-08-16  9:29   ` [bug#65335] [PATCH 3/4] gnu: build: activate-current-system: Ensure directory existence Nicolas Graves via Guix-patches via
2023-08-16  9:29   ` [bug#65335] [PATCH 4/4] gnu: system: bootable-kernel-arguments: Ignore the "none" root case Nicolas Graves via Guix-patches via
2023-08-20 22:15 ` [bug#65335] [PATCH 0/4] Allow mounting root on tmpfs for impersistence Nicolas Graves via Guix-patches via
2023-08-20 22:16 ` [bug#65335] [PATCH v2 1/5] file-systems: canonicalize-device-name: Ignore the "none" case Nicolas Graves via Guix-patches via
2023-08-20 22:16   ` [bug#65335] [PATCH v2 2/5] gnu: services: activation-script: Ensure /var/run existence Nicolas Graves via Guix-patches via
2023-08-21 14:09     ` [bug#65335] [PATCH 0/4] Allow mounting root on tmpfs for impersistence Ludovic Courtès
2023-08-20 22:16   ` [bug#65335] [PATCH v2 3/5] gnu: build: activate-current-system: Ensure directory existence Nicolas Graves via Guix-patches via
2023-08-21 14:09     ` [bug#65335] [PATCH 0/4] Allow mounting root on tmpfs for impersistence Ludovic Courtès
2023-08-20 22:16   ` [bug#65335] [PATCH v2 4/5] gnu: system: bootable-kernel-arguments: Ignore the "none" root case Nicolas Graves via Guix-patches via
2023-08-21 14:10     ` [bug#65335] [PATCH 0/4] Allow mounting root on tmpfs for impersistence Ludovic Courtès
2023-08-21 14:15     ` Ludovic Courtès
2023-08-20 22:16   ` [bug#65335] [PATCH v2 5/5] gnu: home: symlink-manager: Allow dedicated device skip Nicolas Graves via Guix-patches via
2023-08-21 14:12     ` [bug#65335] [PATCH 0/4] Allow mounting root on tmpfs for impersistence Ludovic Courtès
2023-09-09 10:47       ` Ludovic Courtès
2023-10-05 13:07         ` Ludovic Courtès
2023-10-05 14:30           ` Nicolas Graves via Guix-patches via
2023-10-12  6:55             ` Ludovic Courtès
2024-02-15 11:45               ` Nicolas Graves via Guix-patches via
2024-02-19 17:48                 ` bug#65335: " Ludovic Courtès
2024-02-19 23:47                   ` [bug#65335] " Nicolas Graves via Guix-patches via
2023-08-21 14:06   ` Ludovic Courtès
2024-02-04  2:19 ` [bug#65335] [PATCH v3 1/5] gnu: build: file-systems: Extend tmpfs fallback Nicolas Graves via Guix-patches via
2024-02-04  2:19   ` [bug#65335] [PATCH v3 2/5] gnu: services: Ensure /var/run existence in activation-script Nicolas Graves via Guix-patches via
2024-02-04  2:19   ` [bug#65335] [PATCH v3 3/5] gnu: build: activation: Ensure /run existence Nicolas Graves via Guix-patches via
2024-02-04  2:19   ` Nicolas Graves via Guix-patches via [this message]
2024-02-04  2:19   ` [bug#65335] [PATCH v3 5/5] gnu: home: symlink-manager: Allow busy device skip Nicolas Graves via Guix-patches via
2024-03-28  4:25 ` [bug#65335] [PATCH 0/4] Allow mounting root on tmpfs for impersistence Scott Colby

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240204022004.2785-4-ngraves@ngraves.fr \
    --to=guix-patches@gnu.org \
    --cc=65335@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    --cc=ngraves@ngraves.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).