From: Miguel Arruga Vivas <rosen644835@gmail.com>
To: 35394@debbugs.gnu.org
Subject: [bug#35394] [PATCH 3/3] system: Use locale information in grub.cfg.
Date: Mon, 21 Oct 2019 12:46:32 +0200 [thread overview]
Message-ID: <20191021124632.7d050b48@gmail.com> (raw)
In-Reply-To: <20191021124035.531bed75@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
* gnu/bootloader/grub.scm (define-module): Add new dependency.
(grub-configuration-file)[locale-config]: New variable with generated
locale configuration when locale parameter has been provided.
[builder]: Add locale-config.
---
gnu/bootloader/grub.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-system-Use-locale-information-in-grub.cfg.patch --]
[-- Type: text/x-patch, Size: 2400 bytes --]
From c5f4f7d0d3564731dc29f563b70a05ab83eec061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
<rosen644835@gmail.com>
Date: Sat, 19 Oct 2019 13:28:48 +0200
Subject: [PATCH 3/3] system: Use locale information in grub.cfg.
* gnu/bootloader/grub.scm (define-module): Add new dependency.
(grub-configuration-file)[locale-config]: New variable with generated
locale configuration when locale parameter has been provided.
[builder]: Add locale-config.
---
gnu/bootloader/grub.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index a0d068d1bd..8c3bab6fa7 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2019 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,6 +29,7 @@
#:use-module (gnu system uuid)
#:use-module (gnu system file-systems)
#:use-module (gnu system keyboard)
+ #:use-module (gnu system locale)
#:autoload (gnu packages bootloaders) (grub)
#:autoload (gnu packages gtk) (guile-cairo guile-rsvg)
#:autoload (gnu packages xorg) (xkeyboard-config)
@@ -353,6 +355,20 @@ entries corresponding to old generations of the system."
#:system system
#: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
(let ((layout (bootloader-configuration-keyboard-layout config))
(grub (bootloader-package
@@ -372,6 +388,7 @@ keymap ~a~%" keymap)))))
# will be lost upon reconfiguration.
")
#$sugar
+ #$locale-config
#$keyboard-layout-config
(format port "
set default=~a
--
2.23.0
next prev parent reply other threads:[~2019-10-21 10:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 13:17 [bug#35394] [PATCH 0/3] Bootloader localization Miguel
2019-04-23 13:26 ` [bug#35394] [PATCH 1/3] system: Add locale to boot-parameters Miguel
2019-04-23 13:26 ` [bug#35394] [PATCH 2/3] system: Provide locale information to the bootloader Miguel
2019-04-23 13:26 ` [bug#35394] [PATCH 3/3] system: Use locale information in grub.cfg Miguel
2019-04-26 10:50 ` [bug#35394] [PATCH 3/4] gnu: grub: Add locale output for bootloading Miguel
2019-05-03 12:27 ` Miguel
2019-04-26 10:51 ` [bug#35394] [PATCH 4/4] system: Use locale information in grub.cfg Miguel
2019-05-03 12:27 ` Miguel
2019-04-26 10:59 ` Bootloader localization Miguel
2019-04-29 7:56 ` [bug#35394] [PATCH 0/3] " Ludovic Courtès
2019-10-21 10:40 ` Miguel Arruga Vivas
2019-10-21 10:46 ` [bug#35394] [PATCH 1/3] system: Add locale to boot-parameters Miguel Arruga Vivas
2019-10-21 10:46 ` [bug#35394] [PATCH 2/3] system: Provide locale information to the bootloader Miguel Arruga Vivas
2019-10-21 10:46 ` Miguel Arruga Vivas [this message]
2020-10-11 14:18 ` [bug#35394] [PATCH 1/1 v4] Grub i18n Miguel Ángel Arruga Vivas
2020-10-17 16:32 ` Ludovic Courtès
2020-10-18 15:09 ` [bug#35394] [PATCH 4/4 " Miguel Ángel Arruga Vivas
2020-10-18 15:43 ` Miguel Ángel Arruga Vivas
2020-10-19 8:50 ` Ludovic Courtès
2020-10-19 11:41 ` Miguel Ángel Arruga Vivas
2020-10-19 13:21 ` Ludovic Courtès
2020-10-19 13:44 ` Miguel Ángel Arruga Vivas
2020-10-20 20:50 ` Ludovic Courtès
2020-10-20 21:19 ` bug#35394: " Miguel Ángel Arruga Vivas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191021124632.7d050b48@gmail.com \
--to=rosen644835@gmail.com \
--cc=35394@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.