From: "Ludovic Courtès" <ludo@gnu.org>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: 40998@debbugs.gnu.org
Subject: bug#40998: Guix System's initrd doesn't honor rootflags
Date: Sun, 27 Feb 2022 21:54:24 +0100 [thread overview]
Message-ID: <87lexwuj27.fsf_-_@gnu.org> (raw)
In-Reply-To: <20220219070155.1924-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sat, 19 Feb 2022 02:01:52 -0500")
Hi!
Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
> This version field exposes the (already present) version information of a boot
> parameters file.
>
> * gnu/system.scm (%boot-parameters-version): New variable.
> (<boot-parameters>)[version]: New field.
> (read-boot-parameters): Use it.
> (operating-system-boot-parameters-file): Likewise.
> * tests/boot-parameters.scm (test-read-boot-parameters): Use
> %boot-parameters-version as the default version value in the template.
[...]
> (define-record-type* <boot-parameters>
> boot-parameters make-boot-parameters boot-parameters?
> (label boot-parameters-label)
> @@ -322,7 +326,9 @@ (define-record-type* <boot-parameters>
> (kernel boot-parameters-kernel)
> (kernel-arguments boot-parameters-kernel-arguments)
> (initrd boot-parameters-initrd)
> - (multiboot-modules boot-parameters-multiboot-modules))
> + (multiboot-modules boot-parameters-multiboot-modules)
> + (version boot-parameters-version ;positive integer
> + (default %boot-parameters-version)))
[...]
> (match (read port)
> - (('boot-parameters ('version 0)
> + (('boot-parameters ('version (? version? version))
> ('label label) ('root-device root)
> ('kernel kernel)
> rest ...)
> (boot-parameters
> + (version version)
> (label label)
> (root-device (device-sexp->device root))
There’s no need to have a ‘version’ field in live <boot-parameters>
records: have the ‘version’ field in the serialized format (the sexp)
and make sure the deserializer correctly converts to the internal
representation.
Here, I think you can bump the version number in the serialized form,
and have ‘read-boot-parameters’ automatically augment ‘kernel-arguments’
when VERSION is 0 with “--root=XYZ”.
(It might be that you can even do that without bumping the version
number. Bumping is clearer but the downside is that an older Guix will
abort when attempting to read ‘parameters’. This could happen if you
roll back to an earlier generation and try to run ‘guix system
reconfigure’ or similar from there.)
Also, you could write the ‘match’ pattern like this:
('boot-parameters ('version (and version (or 0 1)))
('label label) …)
I hope that makes sense!
Ludo’.
next prev parent reply other threads:[~2022-02-27 20:55 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 13:53 bug#40998: Guix System's initrd doesn't honor rootflags maxim.cournoyer
2022-02-18 15:33 ` bug#40998: [PATCH 1/3] initrd: Rename the '--root' initrd option to just 'root' Maxim Cournoyer
2022-02-18 15:33 ` bug#40998: [PATCH 2/3] initrd: Honor rootfstype and rootflags command-line parameters Maxim Cournoyer
2022-02-18 15:33 ` bug#40998: [PATCH 3/3] initrd: Print its " Maxim Cournoyer
2022-02-19 7:01 ` bug#40998: [PATCH v2 1/4] system: Add a version field to the <boot-parameters> record Maxim Cournoyer
2022-02-19 7:01 ` bug#40998: [PATCH v2 2/4] initrd: Use non-hyphenated kernel command-line parameter names Maxim Cournoyer
2022-02-27 21:03 ` bug#40998: Guix System's initrd doesn't honor rootflags Ludovic Courtès
2022-02-28 20:31 ` Maxim Cournoyer
2022-02-19 7:01 ` bug#40998: [PATCH v2 3/4] initrd: Honor rootfstype and rootflags command-line parameters Maxim Cournoyer
2022-02-27 21:06 ` bug#40998: Guix System's initrd doesn't honor rootflags Ludovic Courtès
2022-02-19 7:01 ` bug#40998: [PATCH v2 4/4] initrd: Print its command-line parameters Maxim Cournoyer
2022-02-27 21:08 ` bug#40998: Guix System's initrd doesn't honor rootflags Ludovic Courtès
2022-02-28 20:36 ` Maxim Cournoyer
2022-02-28 3:45 ` bug#40998: [PATCH v2 4/4] initrd: Print its command-line parameters Tobias Geerinckx-Rice via Bug reports for GNU Guix
2022-02-28 15:54 ` Maxim Cournoyer
2022-02-27 20:54 ` Ludovic Courtès [this message]
2022-02-28 20:02 ` bug#40998: Guix System's initrd doesn't honor rootflags Maxim Cournoyer
2022-02-28 21:15 ` Ludovic Courtès
2022-02-28 21:45 ` Maxim Cournoyer
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=87lexwuj27.fsf_-_@gnu.org \
--to=ludo@gnu.org \
--cc=40998@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
/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).