me
/
guix
Archived
1
0
Fork 0
Code

installer: Warn about hardware support after the welcome page. 

This is a followup to 682639c107, which
added the uvesafb upfront, before welcome page had been displayed.

* gnu/installer/newt/welcome.scm (check-hardware-support): New
procedure.
(run-welcome-page): Use it.
Ludovic Courtès 2022-11-03 10:42:50 +01:00
parent de61a0aa4a
commit 4f7ffb97a4
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/installer/newt/welcome.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2022 Florian Pelz <pelzflorian@pelzflorian.de>
;;;
;;; This file is part of GNU Guix.
@ -121,21 +121,22 @@ we want this page to occupy all the screen space available."
(lambda ()
(destroy-form-and-pop form))))))
(define (run-welcome-page logo)
"Run a welcome page with the given textual LOGO displayed at the center of
the page. Ask the user to choose between manual installation, graphical
installation and reboot."
(begin
(define (check-hardware-support)
"Warn about unsupported devices."
(when (member "uvesafb" (modules-loaded))
(run-error-page (G_ "\
This may be a false alarm, but possibly your graphics hardware does not
work well with only free software. Expect trouble. If after installation,
the system does not boot, perhaps you will need to add nomodeset to the
kernel arguments and need to configure the uvesafb kernel module.")
(G_ "Pre-install warning")))
(G_ "Pre-install warning"))))
(define (run-welcome-page logo)
"Run a welcome page with the given textual LOGO displayed at the center of
the page. Ask the user to choose between manual installation, graphical
installation and reboot."
(when (file-exists? %core-dump)
(match
(choice-window
(match (choice-window
(G_ "Previous installation failed")
(G_ "Continue")
(G_ "Report the failure")
@ -146,6 +147,7 @@ first?"))
(2 (raise
(condition
(&user-abort-error))))))
(run-menu-page
(G_ "GNU Guix install")
(G_ "Welcome to GNU Guix system installer!
@ -159,10 +161,11 @@ Documentation is accessible at any time by pressing Ctrl-Alt-F2.")
#:listbox-items
`((,(G_ "Graphical install using a terminal based interface")
.
,(const #t))
,check-hardware-support)
(,(G_ "Install using the shell based process")
.
,(lambda ()
(check-hardware-support)
;; Switch to TTY3, where a root shell is available for shell based
;; install. The other root TTY's would have been ok too.
(system* "chvt" "3")
@ -172,4 +175,4 @@ Documentation is accessible at any time by pressing Ctrl-Alt-F2.")
,(lambda ()
(newt-finish)
(reboot))))
#:listbox-item->text car)))
#:listbox-item->text car))