diff options
| author | Ludovic Courtès <[email protected]> | 2025-01-06 11:37:35 +0100 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2025-01-07 17:44:12 +0100 |
| commit | d8b7259197aae7370cf7f72af74a6a0c0663737f (patch) | |
| tree | c601fdcca3d8b7043b92e5bc02c1d5ce27dcdb6a | |
| parent | 2cb1b72a08553fcee4dd7e5ab50da84601345119 (diff) | |
reconfigure: Do not pass KEXEC_FILE_DEBUG.
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 <[email protected]>
Reported-by: Simen Endsjø <[email protected]>
Change-Id: Ia48be7f4cfa9c6352908e4bea6472cd648f866ed
| -rw-r--r-- | guix/build/syscalls.scm | 4 | ||||
| -rw-r--r-- | 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 <[email protected]> +;;; Copyright © 2014-2025 Ludovic Courtès <[email protected]> ;;; Copyright © 2015 David Thompson <[email protected]> ;;; Copyright © 2015 Mark H Weaver <[email protected]> ;;; Copyright © 2017 Mathieu Othacehe <[email protected]> @@ -783,7 +783,7 @@ terminating nul character." (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 <[email protected]> +;;; Copyright © 2014-2022, 2024-2025 Ludovic Courtès <[email protected]> ;;; Copyright © 2016 Alex Kost <[email protected]> ;;; Copyright © 2016, 2017, 2018 Chris Marusich <[email protected]> ;;; Copyright © 2017 Mathieu Othacehe <[email protected]> @@ -198,8 +198,7 @@ via 'kexec'." (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, |