kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

system: Generate grub locale directory for grub.cfg.

Browse Source 
* gnu/bootloader/grub.scm (grub-locale-directory): New function.
(grub-configuration-file)[locale-config]: Use grub-locale-directory and
avoid the extra search when eye-candy have performed it.
This commit is contained in:
Miguel Ángel Arruga Vivas 2020-10-24 20:36:21 +02:00
parent 70876b0793
commit f445bc6576
No known key found for this signature in database
GPG Key ID: 634C6E8979FABEC2
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gnu/bootloader/grub.scm
View File

@ -142,6 +142,24 @@ file with the resolution provided in CONFIG."
(image->png image #:width width #:height height)) (image->png image #:width width #:height height))
(_ #f))))) (_ #f)))))
(define (grub-locale-directory grub)
"Generate a directory with the locales from GRUB."
(define builder
#~(begin
(use-modules (ice-9 ftw))
(let ((locale (string-append #$grub "/share/locale"))
(out #$output))
(mkdir out)
(chdir out)
(for-each (lambda (lang)
(let ((file (string-append locale "/" lang
"/LC_MESSAGES/grub.mo"))
(dest (string-append lang ".mo")))
(when (file-exists? file)
(copy-file file dest))))
(scandir locale)))))
(computed-file "grub-locales" builder))
(define* (eye-candy config store-device store-mount-point (define* (eye-candy config store-device store-mount-point
#:key store-directory-prefix port) #:key store-directory-prefix port)
"Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part "Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part
@ -404,18 +422,33 @@ menuentry ~s {
#:port #~port))) #:port #~port)))
(define locale-config (define locale-config
#~(let ((locale #$(and locale (let* ((entry (first all-entries))
(locale-definition-source (device (menu-entry-device entry))
(locale-name->definition locale))))) (mount-point (menu-entry-device-mount-point entry))
(when locale (bootloader (bootloader-configuration-bootloader config))
(format port "\ (grub (bootloader-package bootloader)))
#~(let ((locale #$(and locale
(locale-definition-source
(locale-name->definition locale))))
(locales #$(and locale
(normalize-file (grub-locale-directory grub)
mount-point
store-directory-prefix))))
(when locale
(format port "\
# Localization configuration. # Localization configuration.
if search --file --set boot_partition /grub/grub.cfg; then ~asearch --file --set ~a/en@quot.mo
set locale_dir=(${boot_partition})/grub/locale set locale_dir=~a
else set lang=~a~%"
set locale_dir=/boot/grub/locale ;; Skip the search if there is an image, as it has already
fi ;; been performed by eye-candy and traversing the store is
set lang=~a~%" locale)))) ;; an expensive operation.
#$(if (grub-theme-image (bootloader-theme config))
"# "
"")
locales
locales
locale)))))
(define keyboard-layout-config (define keyboard-layout-config
(let* ((layout (bootloader-configuration-keyboard-layout config)) (let* ((layout (bootloader-configuration-keyboard-layout config))