unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 40538@debbugs.gnu.org
Subject: bug#40538: installer: Support uvesafb to install on machines without KMS.
Date: Sat, 11 Apr 2020 20:43:46 +0200	[thread overview]
Message-ID: <20200411184346.c3cgop7egcjyqzwf@pelzflorian.localdomain> (raw)
In-Reply-To: <87tv1rv21e.fsf@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 1553 bytes --]

On Fri, Apr 10, 2020 at 04:38:37PM +0200, Ludovic Courtès wrote:
> > +     (if (member (%current-system) '("x86_64-linux" "i686-linux"))
> > +         ;; Load uvesafb to show installer when no KMS is available.
> > +         `(,(service kernel-module-loader-service-type '("uvesafb"))
> > +           [...]
> 
> This is not quite correct because here ‘%current-system’ is evaluated at
> the top level, when (gnu tests install) is loaded.  So on my laptop,
> it’s always "x86_64-linux", regardless of any ‘-s’ flags.  Also, it
> ignores ‘--target’.
> 
> Can we arrange to make it unconditional?
> 
> One way to do that (not great), would be to make it an activation
> snippet: since activation snippets are written as monadic code, we can
> reliably check ‘%current-system’ & ‘%current-target-system’ from there.
> (For lack of a solution like <https://issues.guix.gnu.org/issue/29296>.)

Please consider the attached patch.  I chose to go without
kernel-module-loader-service (only copying its requirements field)
because I do not know how to conditionally extend or start another
Shepherd service from an activation snippet.

I tested it on QEMU with and without nomodeset.  With a previous Guix
System install image, it stayed black when adding a nomodeset kernel
parameter.  I will test again on real hardware now, but previous
testing of uvesafb-enabled installer images proved successful unlike
non-uvesafb images.

Feel free to adapt the patch or not include it.  Or tell me to change
it if there is time.

Regards,
Florian

[-- Attachment #2: 0001-installer-Load-uvesafb-kernel-module.patch --]
[-- Type: text/plain, Size: 4653 bytes --]

From 85a95ce758384979a0aae3bc9065197c74862b4b Mon Sep 17 00:00:00 2001
From: Florian Pelz <pelzflorian@pelzflorian.de>
Date: Sat, 11 Apr 2020 18:56:37 +0200
Subject: [PATCH] installer: Load uvesafb kernel module.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes <https://bugs.gnu.org/40538>.

Machines without Kernel Mode Setting (those with many old and current AMD
GPUs, SiS GPUs, …) need uvesafb to show the GUI installer.  Some may also need
a kernel parameter like nomodeset or vga=793, but we leave that for the user
to specify in GRUB.

* gnu/system/install.scm (uvesafb-shepherd-service): New procedure.
(uvesafb-service-type): New variable.
(%uvesafb-service): New variable.
(%installation-services): Add it.
---
 gnu/system/install.scm | 47 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index c15c2c7814..73a013bed0 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,6 +28,7 @@
   #:use-module (guix gexp)
   #:use-module (guix store)
   #:use-module (guix monads)
+  #:use-module (guix modules)
   #:use-module ((guix packages) #:select (package-version))
   #:use-module ((guix store) #:select (%store-prefix))
   #:use-module (gnu installer)
@@ -50,6 +52,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages nvi)
+  #:use-module (gnu packages xorg)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-26)
   #:export (installation-os
@@ -273,7 +276,6 @@ the user's target storage device rather than on the RAM disk."
 (define %configuration-template-service
   (service configuration-template-service-type #t))
 
-
 (define %nscd-minimal-caches
   ;; Minimal in-memory caching policy for nscd.
   (list (nscd-cache (database 'hosts)
@@ -287,6 +289,41 @@ the user's target storage device rather than on the RAM disk."
                     (persistent? #f)
                     (max-database-size (* 5 (expt 2 20)))))) ;5 MiB
 
+\f
+;; These define a service to load the uvesafb kernel module with the
+;; appropriate options.  The GUI installer needs it when the machine does not
+;; support Kernel Mode Setting.  Otherwise kmscon is missing /dev/fb0.
+(define (uvesafb-shepherd-service _)
+  (list (shepherd-service
+         (documentation "Load uvesafb.")
+         (provision '(uvesafb))
+         (requirement '(file-systems))
+         (start (with-imported-modules (source-module-closure '((guix utils)))
+                  #~(begin
+                      (use-modules (guix utils))
+                      (lambda ()
+                        ;; uvesafb is only supported on x86 and x86_64.
+                        (if (member (%current-system)
+                                    '("x86_64-linux" "i686-linux"))
+                            (invoke #+(file-append kmod "/bin/modprobe")
+                                    "uvesafb"
+                                    (string-append "v86d=" #$v86d "/sbin/v86d")
+                                    "mode_option=1024x768")
+                            #t)))))
+         (respawn? #f)
+         (one-shot? #t))))
+
+(define uvesafb-service-type
+  (service-type
+   (name 'uvesafb)
+   (extensions
+    (list (service-extension shepherd-root-service-type
+                             uvesafb-shepherd-service)))
+   (default-value #t)))
+
+(define %uvesafb-service
+  (service uvesafb-service-type))
+
 (define %installation-services
   ;; List of services of the installation system.
   (let ((motd (plain-file "motd" "
@@ -408,7 +445,13 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
                    (list bare-bones-os
                          glibc-utf8-locales
                          texinfo
-                         (canonical-package guile-2.2))))))
+                         (canonical-package guile-2.2)))
+
+          ;; Machines without Kernel Mode Setting (those with many old and
+          ;; current AMD GPUs, SiS GPUs, ...) need uvesafb to show the GUI
+          ;; installer.  Some may also need a kernel parameter like nomodeset
+          ;; or vga=793, but we leave that for the user to specify in GRUB.
+          %uvesafb-service)))
 
 (define %issue
   ;; Greeting.
-- 
2.26.0


  parent reply	other threads:[~2020-04-11 18:44 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-10 12:54 bug#40538: installer: Support uvesafb to install on machines without KMS pelzflorian (Florian Pelz)
2020-04-10 14:38 ` Ludovic Courtès
2020-04-10 14:58   ` pelzflorian (Florian Pelz)
2020-04-12  6:37     ` Bengt Richter
2020-04-12  8:35       ` Bengt Richter
2020-04-12  8:56       ` pelzflorian (Florian Pelz)
2020-04-11 18:43   ` pelzflorian (Florian Pelz) [this message]
2020-04-11 19:03     ` pelzflorian (Florian Pelz)
2020-04-11 20:59     ` Ludovic Courtès
2020-04-11 21:11       ` Efraim Flashner
2020-04-12  9:23         ` pelzflorian (Florian Pelz)
2020-04-12 14:28           ` Ludovic Courtès
2020-04-12 18:33             ` pelzflorian (Florian Pelz)
2020-04-12  9:02       ` pelzflorian (Florian Pelz)
2020-04-12 11:24         ` pelzflorian (Florian Pelz)
2020-04-12 12:33           ` pelzflorian (Florian Pelz)
2020-04-12 14:48           ` Mathieu Othacehe
2020-04-12 15:30             ` pelzflorian (Florian Pelz)
2020-04-12 17:48               ` Bengt Richter
2020-04-12 18:11                 ` pelzflorian (Florian Pelz)
2020-04-13  5:00                   ` Bengt Richter
2020-04-13  5:37                     ` pelzflorian (Florian Pelz)
2020-04-14  8:57                       ` pelzflorian (Florian Pelz)
2020-04-14  7:24               ` Mathieu Othacehe
2020-04-14  8:16                 ` pelzflorian (Florian Pelz)
2020-04-14  8:34                   ` pelzflorian (Florian Pelz)
2020-04-14 10:09                   ` Ludovic Courtès
2020-04-14 10:28                     ` pelzflorian (Florian Pelz)
2020-04-14 13:14                       ` pelzflorian (Florian Pelz)
2020-04-14 14:12                         ` Ludovic Courtès
2020-04-14 17:09                         ` Mathieu Othacehe
2020-04-14 21:31                           ` pelzflorian (Florian Pelz)

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=20200411184346.c3cgop7egcjyqzwf@pelzflorian.localdomain \
    --to=pelzflorian@pelzflorian.de \
    --cc=40538@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /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).