diff options
| author | Leo Famulari <leo@famulari.name> | 2025-04-26 23:56:12 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2025-04-27 02:29:41 -0400 |
| commit | 8f885a2bb3474a29dc24875466993e1256d0eb22 (patch) | |
| tree | 9fcf311f1afb50745f77b6f0219cff915f0cda58 | |
| parent | 32575294eef1b1cfc6564dc7217e42c740c08cda (diff) | |
| download | guix-8f885a2bb3474a29dc24875466993e1256d0eb22.tar.gz guix-8f885a2bb3474a29dc24875466993e1256d0eb22.zip | |
vm: Account for an upstream change in the name of the Cirrus kernel module.
* gnu/system/vm.scm (virtualized-operating-system): Choose the module name based
on the kernel version
Change-Id: I77d70fa44a8d5d2412ae0aaa645fa67146b76432
| -rw-r--r-- | gnu/system/vm.scm | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index d4a15257d3..4a0d68d2cd 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -193,10 +193,20 @@ environment with the store shared with the host. MAPPINGS is a list of rest))) ;; The (QEMU-only) "cirrus" graphics driver is still expected by some ;; VPS with old QEMU versions. See <https://bugs.gnu.org/36069>. - (initrd-modules (let ((modules (operating-system-initrd-modules os))) - (if (member "cirrus" modules) + ;; + ;; XXX In 6.14, the kernel renamed the "cirrus" module to "cirrus-qemu", so + ;; we account for that here. The renaming was done in this commit: + ;; https://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git/commit/?id=5c3c99868aa2e0b68ac69f8050a6b9c994e73397 + (initrd-modules (let* ((modules (operating-system-initrd-modules os)) + (kernel-version + (package-version (operating-system-kernel os))) + (cirrus-module + (if (string< kernel-version "6.14") + "cirrus" + "cirrus-qemu"))) + (if (member cirrus-module modules) modules - (cons "cirrus" modules)))) + (cons cirrus-module modules)))) ;; Disable swap. (swap-devices '()) |