me
/
guix
Archived
1
0
Fork 0
Code

system: Use locale information in grub.cfg. 

* gnu/bootloader/grub.scm (define-module): Add new dependency.
(grub-configuration-file): Add locale keyword.
(grub-configuration-file)[locale-config]: New variable with generated
locale configuration when locale parameter has been provided.
[builder]: Add locale-config.
master
Miguel Ángel Arruga Vivas 2019-11-02 18:18:45 +01:00
parent eaf0963983
commit cfe9c7eceb
No known key found for this signature in database
GPG Key ID: 634C6E8979FABEC2
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/bootloader/grub.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de> ;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de>
;;; ;;;
@ -33,6 +34,7 @@
#:use-module (gnu system uuid) #:use-module (gnu system uuid)
#:use-module (gnu system file-systems) #:use-module (gnu system file-systems)
#:use-module (gnu system keyboard) #:use-module (gnu system keyboard)
#:use-module (gnu system locale)
#:use-module (gnu packages bootloaders) #:use-module (gnu packages bootloaders)
#:autoload (gnu packages gtk) (guile-cairo guile-rsvg) #:autoload (gnu packages gtk) (guile-cairo guile-rsvg)
#:autoload (gnu packages xorg) (xkeyboard-config) #:autoload (gnu packages xorg) (xkeyboard-config)
@ -334,6 +336,7 @@ code."
(define* (grub-configuration-file config entries (define* (grub-configuration-file config entries
#:key #:key
(locale #f)
(system (%current-system)) (system (%current-system))
(old-entries '()) (old-entries '())
store-directory-prefix) store-directory-prefix)
@ -398,6 +401,20 @@ menuentry ~s {
#:store-directory-prefix store-directory-prefix #:store-directory-prefix store-directory-prefix
#:port #~port))) #:port #~port)))
(define locale-config
#~(let ((locale #$(and locale
(locale-definition-source
(locale-name->definition locale)))))
(when locale
(format port "\
# Localization configuration.
if search --file --set boot_partition /grub/grub.cfg; then
set locale_dir=(${boot_partition})/grub/locale
else
set locale_dir=/boot/grub/locale
fi
set lang=~a~%" locale))))
(define keyboard-layout-config (define keyboard-layout-config
(let* ((layout (bootloader-configuration-keyboard-layout config)) (let* ((layout (bootloader-configuration-keyboard-layout config))
(grub (bootloader-package (grub (bootloader-package
@ -422,6 +439,7 @@ keymap ~a~%" #$keymap))))
# will be lost upon reconfiguration. # will be lost upon reconfiguration.
") ")
#$(sugar) #$(sugar)
#$locale-config
#$keyboard-layout-config #$keyboard-layout-config
(format port " (format port "
set default=~a set default=~a