From: "Ludovic Courtès" <ludo@gnu.org>
To: 75402@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>,
nathan <nathan_mail@nborghese.com>,
"Simen Endsjø" <contact@simendsjo.me>,
"Christopher Baines" <guix@cbaines.net>,
"Josselin Poiret" <dev@jpoiret.xyz>,
"Ludovic Courtès" <ludo@gnu.org>,
"Mathieu Othacehe" <othacehe@gnu.org>,
"Simon Tournier" <zimon.toutoune@gmail.com>,
"Tobias Geerinckx-Rice" <me@tobias.gr>
Subject: [bug#75402] [PATCH 1/3] reconfigure: Do not pass KEXEC_FILE_DEBUG.
Date: Mon, 6 Jan 2025 13:58:35 +0100 [thread overview]
Message-ID: <5c693e7d8bec42c1430bf9de00b8b408f38c6d39.1736168030.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1736168030.git.ludo@gnu.org>
This flag is unsupported in Linux 6.6 and causes ‘kexec_file_load’ to
fail with EINVAL.
Fixes <https://issues.guix.gnu.org/75211>.
* guix/scripts/system/reconfigure.scm (kexec-loading-program): Remove
KEXEC_FILE_DEBUG.
* guix/build/syscalls.scm (KEXEC_FILE_DEBUG): Add comment.
Suggested-by: nathan <nathan_mail@nborghese.com>
Reported-by: Simen Endsjø <contact@simendsjo.me>
Change-Id: Ia48be7f4cfa9c6352908e4bea6472cd648f866ed
---
guix/build/syscalls.scm | 4 ++--
guix/scripts/system/reconfigure.scm | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 960339e8bf..0f8927844b 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014-2024 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -783,7 +783,7 @@ (define (string->utf-8/nul-terminated str)
(define KEXEC_FILE_UNLOAD #x00000001)
(define KEXEC_FILE_ON_CRASH #x00000002)
(define KEXEC_FILE_NO_INITRAMFS #x00000004)
-(define KEXEC_FILE_DEBUG #x00000008)
+(define KEXEC_FILE_DEBUG #x00000008) ;missing from Linux 6.6
(define kexec-load-file
(let* ((proc (syscall->procedure int "syscall"
diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm
index e9e16e3422..96e5bff351 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014-2022, 2024 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2022, 2024-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017, 2018 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@@ -198,8 +198,7 @@ (define (kexec-loading-program os)
(kexec-load-file kernel initrd
(string-join
(list #$@(operating-system-kernel-arguments
- os root-device)))
- KEXEC_FILE_DEBUG)))))))
+ os root-device))))))))))
(define* (upgrade-shepherd-services eval os)
"Using EVAL, a monadic procedure taking a single G-Expression as an argument,
--
2.47.1
next prev parent reply other threads:[~2025-01-06 13:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-06 12:57 [bug#75402] [PATCH 0/3] Assorted kexec fixes Ludovic Courtès
2025-01-06 12:58 ` Ludovic Courtès [this message]
2025-01-06 12:58 ` [bug#75402] [PATCH 2/3] syscalls: Remove wrong syscall ID for ‘kexec_load_file’ on i686 Ludovic Courtès
2025-01-06 12:58 ` [bug#75402] [PATCH 3/3] reconfigure: Make ‘load-system-for-kexec’ errors non-fatal Ludovic Courtès
2025-01-07 10:41 ` [bug#75402] [PATCH 0/3] Assorted kexec fixes Tomas Volf
2025-01-07 10:48 ` Ludovic Courtès
2025-01-07 10:58 ` Tomas Volf
2025-01-07 18:12 ` Ludovic Courtès
2025-01-07 18:08 ` bug#75402: " Ludovic Courtès
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=5c693e7d8bec42c1430bf9de00b8b408f38c6d39.1736168030.git.ludo@gnu.org \
--to=ludo@gnu.org \
--cc=75402@debbugs.gnu.org \
--cc=contact@simendsjo.me \
--cc=dev@jpoiret.xyz \
--cc=guix@cbaines.net \
--cc=me@tobias.gr \
--cc=nathan_mail@nborghese.com \
--cc=othacehe@gnu.org \
--cc=zimon.toutoune@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).