guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: system: vm: Include the cirrus driver in the init


From: guix-commits
Subject: branch master updated: system: vm: Include the cirrus driver in the initrd.
Date: Fri, 03 Nov 2023 15:48:14 -0400

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2059b9fbe0 system: vm: Include the cirrus driver in the initrd.
2059b9fbe0 is described below

commit 2059b9fbe0712e070b6e438b91484c170bf599ff
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Oct 29 02:00:00 2023 +0200

    system: vm: Include the cirrus driver in the initrd.
    
    This is Ludo's suggestion at <https://issues.guix.gnu.org/36069#26>,
    with an added guard against duplicates and a tweaked comment.
    
    * gnu/system/vm.scm (virtualized-operating-system): Add "cirrus" to the
    list of INITRD-MODULES.
    
    Co-authored-by: Ludovic Courtès <ludo@gnu.org>
    Change-Id: I1a86286586eee0b8c39706544778c7911a86da33
---
 gnu/system/vm.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 70f7b00116..8c27ff787d 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -168,6 +168,12 @@ environment with the store shared with the host.  MAPPINGS 
is a list of
                      file-systems
                      #:volatile-root? volatile?
                      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)
+                          modules
+                          (cons "cirrus" modules))))
 
     ;; Disable swap.
     (swap-devices '())



reply via email to

[Prev in Thread] Current Thread [Next in Thread]