Changes w.r.t. previous version:
- Call normalize-file (the parameters were there but I lost the call).
- Only call search when there is no image configured.
>From 3eb494947ed863e60d3d49d4ac4a982b1f9237e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
<[email protected]>
Date: Sat, 24 Oct 2020 20:36:21 +0200
Subject: [PATCH] system: Do not depend on locale folder generated by
grub-install.
* gnu/bootloader/grub.scm (define-module): Use (guix packages).
(grub-locale-folder): New computed folder.
(grub-configuration-file)[locale-config]: Use grub-locale-folder only when a
locale is needed.
---
gnu/bootloader/grub.scm | 56 +++++++++++++++++++++++++++++++++--------
1 file changed, 45 insertions(+), 11 deletions(-)
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 5508319d3b..2604f59117 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -25,6 +25,7 @@
(define-module (gnu bootloader grub)
#:use-module (guix build union)
+ #:use-module (guix packages)
#:use-module (guix records)
#:use-module (guix store)
#:use-module (guix utils)
@@ -142,6 +143,24 @@ file with the resolution provided in CONFIG."
(image->png image #:width width #:height height))
(_ #f)))))
+(define (grub-locale-folder grub)
+ "Generate a folder 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-boot-locale" builder))
+
(define* (eye-candy config store-device store-mount-point
#:key store-directory-prefix port)
"Return a gexp that writes to PORT (a port-valued gexp) the 'grub.cfg' part
@@ -404,18 +423,33 @@ menuentry ~s {
#:port #~port)))
(define locale-config
- #~(let ((locale #$(and locale
- (locale-definition-source
- (locale-name->definition locale)))))
- (when locale
- (format port "\
+ (let* ((entry (first all-entries))
+ (device (menu-entry-device entry))
+ (mount-point (menu-entry-device-mount-point entry))
+ (bootloader (bootloader-configuration-bootloader config))
+ (grub (bootloader-package bootloader))
+ (locale-dir (normalize-file (grub-locale-folder grub)
+ mount-point
+ store-directory-prefix)))
+
+ #~(let ((locale #$(and locale
+ (locale-definition-source
+ (locale-name->definition locale))))
+ (locale-dir #$(and locale locale-dir)))
+ (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))))
+~asearch --file --set ~a/[email protected]
+set locale_dir=~a
+set lang=~a~%"
+ ;; Skip the search if there is an image, because it is
+ ;; loaded before this fragment, to avoid the extra search.
+ #$(if (grub-theme-image (bootloader-theme config))
+ "# "
+ "")
+ locale-dir
+ locale-dir
+ locale)))))
(define keyboard-layout-config
(let* ((layout (bootloader-configuration-keyboard-layout config))
--
2.28.0
