From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 60055@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#60055] [PATCH] scripts: system: Skip initrd modules check when using --target.
Date: Tue, 13 Dec 2022 20:53:03 -0500 [thread overview]
Message-ID: <20221214015303.18991-1-maxim.cournoyer@gmail.com> (raw)
* guix/scripts/system.scm (perform-action): Do not call CHECK-INITRD-MODULES
when the %current-target-system parameter is set.
---
guix/scripts/system.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 6482318168..54a79501ec 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -842,7 +842,10 @@ (define bootcfg
(check-mapped-devices os)
(when (zero? (getuid))
(check-file-system-availability (operating-system-file-systems os))
- (check-initrd-modules os)))
+ (unless (%current-target-system)
+ ;; Skip the check if the user is making use of --target, as it doesn't
+ ;; make sense in this context.
+ (check-initrd-modules os))))
(mlet* %store-monad
((sys (system-derivation-for-action image action
base-commit: 0ffa501f2b3e83ae56e9c2bd31418439090e869a
prerequisite-patch-id: 660177fb9eee55d11983ea9360c072730d0d21a5
prerequisite-patch-id: 776778c03bce9b7ad3ab94a120f42b764c00fcae
prerequisite-patch-id: 4910d08bdc27384d76030b6ac491ad2c2ed0957f
prerequisite-patch-id: fd4074fb4cf068ccac3122c19138f098a610542a
prerequisite-patch-id: b9b6f21a2db3f7a5ef82bb11ed23f69749cc6b3d
prerequisite-patch-id: 51cecbabc04c69d4338addaece536c42a075660f
prerequisite-patch-id: 2c67bfd85b343a65440e6c63451e5417129dea6f
prerequisite-patch-id: b24087b240dad97b6417e37176915c24a543e887
prerequisite-patch-id: 2b8e69760af1f7bfb66c1edb44471653b6b229d1
prerequisite-patch-id: 2cb8792eedc8cfc23b4728f9ec44366aa394b954
prerequisite-patch-id: 8684fb6949ced334698dbf32ae71dd76c5eb2cfe
--
2.38.1
next reply other threads:[~2022-12-14 1:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 1:53 Maxim Cournoyer [this message]
2022-12-21 13:34 ` [bug#60055] [PATCH] scripts: system: Skip initrd modules check when using --target Ludovic Courtès
2022-12-21 19:24 ` bug#60055: " 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221214015303.18991-1-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=60055@debbugs.gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.