ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: grub: Load relevant EFI modules on EFI systems.

Browse source 
* gnu/system/grub.scm (eye-candy)[setup-gfxterm-body]: Add 'insmod'
invocations when ${grub_platform} is "efi".
This commit is contained in:
Ludovic Courtès 2017-01-03 18:14:50 +01:00
parent 70c6341110
commit 4d0a3d8e9f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/system/grub.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -177,9 +177,9 @@ (define* (eye-candy config store-device store-mount-point
background image and fonts must be searched for. SYSTEM must be the target background image and fonts must be searched for. SYSTEM must be the target
system string---e.g., \"x86_64-linux\"." system string---e.g., \"x86_64-linux\"."
(define setup-gfxterm-body (define setup-gfxterm-body
;; Intel systems need to be switched into graphics mode, whereas most ;; Intel and EFI systems need to be switched into graphics mode, whereas
;; other modern architectures have no other mode and therefore don't need ;; most other modern architectures have no other mode and therefore don't
;; to be switched. ;; need to be switched.
(if (string-match "^(x86_64|i[3-6]86)-" system) (if (string-match "^(x86_64|i[3-6]86)-" system)
" "
# Leave 'gfxmode' to 'auto'. # Leave 'gfxmode' to 'auto'.
@ -188,6 +188,15 @@ (define setup-gfxterm-body
insmod video_bochs insmod video_bochs
insmod video_cirrus insmod video_cirrus
insmod gfxterm insmod gfxterm
if [ \"${grub_platform}\" == efi ]; then
# This is for (U)EFI systems (these modules are unavailable in the
# non-EFI GRUB.) If we don't load them, GRUB boots in \"blind mode\",
# which isn't convenient.
insmod efi_gop
insmod efi_uga
fi
terminal_output gfxterm terminal_output gfxterm
" "
"")) ""))