tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

vm: Account for an upstream change in the name of the Cirrus kernel module.

Browse Source 
* gnu/system/vm.scm (virtualized-operating-system): Choose the module name based
on the kernel version

Change-Id: I77d70fa44a8d5d2412ae0aaa645fa67146b76432
This commit is contained in:
Leo Famulari
2025-04-26 23:56:12 -04:00
parent 32575294ee
commit 8f885a2bb3
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/system/vm.scm
View File

@@ -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 '())