From: Miguel <rosen644835@gmail.com>
To: 35394@debbugs.gnu.org
Subject: [bug#35394] [PATCH 2/3] system: Provide locale information to the bootloader.
Date: Tue, 23 Apr 2019 15:26:28 +0200 [thread overview]
Message-ID: <20190423152628.53387a9b@gmail.com> (raw)
In-Reply-To: <20190423151702.05258473@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 719 bytes --]
system: Provide locale information to the bootloader.
* gnu/bootloader/depthcharge.scm (depthcharge-configuration-file): Add
locale keyword.
* gnu/bootloader/extlinux.scm (extlinux-configuration-file): Likewise.
* gnu/bootloader/grub.scm (grub-configuration-file): Likewise.
* gnu/system.scm (operating-system-bootcfg): Provide locale information
to the bootloader.
* guix/system/script.scm (reinstall-bootloader): Use locale information
from boot-parameters.
---
gnu/bootloader/depthcharge.scm | 3 ++-
gnu/bootloader/extlinux.scm | 3 ++-
gnu/bootloader/grub.scm | 3 ++-
gnu/system.scm | 4 +++-
guix/scripts/system.scm | 4 +++-
5 files changed, 12 insertions(+), 5 deletions(-)
[-- Attachment #2: 0002-system-Provide-locale-information-to-the-bootloader.patch --]
[-- Type: text/x-patch, Size: 5159 bytes --]
From e5fde74621973e54cdb2983361b90180b5367e74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
<rosen644835@gmail.com>
Date: Mon, 22 Apr 2019 14:44:22 +0200
Subject: [PATCH 2/3] system: Provide locale information to the bootloader.
* gnu/bootloader/depthcharge.scm (depthcharge-configuration-file): Add
locale keyword.
* gnu/bootloader/extlinux.scm (extlinux-configuration-file): Likewise.
* gnu/bootloader/grub.scm (grub-configuration-file): Likewise.
* gnu/system.scm (operating-system-bootcfg): Provide locale information
to the bootloader.
* guix/system/script.scm (reinstall-bootloader): Use locale information
from boot-parameters.
---
gnu/bootloader/depthcharge.scm | 3 ++-
gnu/bootloader/extlinux.scm | 3 ++-
gnu/bootloader/grub.scm | 3 ++-
gnu/system.scm | 4 +++-
guix/scripts/system.scm | 4 +++-
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/gnu/bootloader/depthcharge.scm b/gnu/bootloader/depthcharge.scm
index 58cc3f3932..0e0c17a255 100644
--- a/gnu/bootloader/depthcharge.scm
+++ b/gnu/bootloader/depthcharge.scm
@@ -82,7 +82,8 @@
(define* (depthcharge-configuration-file config entries
#:key
(system (%current-system))
- (old-entries '()))
+ (old-entries '())
+ (locale #f))
(match entries
((entry)
(let ((kernel (menu-entry-linux entry))
diff --git a/gnu/bootloader/extlinux.scm b/gnu/bootloader/extlinux.scm
index 40108584a8..e4ccc47484 100644
--- a/gnu/bootloader/extlinux.scm
+++ b/gnu/bootloader/extlinux.scm
@@ -28,7 +28,8 @@
(define* (extlinux-configuration-file config entries
#:key
(system (%current-system))
- (old-entries '()))
+ (old-entries '())
+ (locale #f))
"Return the U-Boot configuration file corresponding to CONFIG, a
<u-boot-configuration> object, and where the store is available at STORE-FS, a
<file-system> object. OLD-ENTRIES is taken to be a list of menu entries
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index e97a17b3e2..446f90157c 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -316,7 +316,8 @@ code."
(define* (grub-configuration-file config entries
#:key
(system (%current-system))
- (old-entries '()))
+ (old-entries '())
+ (locale #f))
"Return the GRUB configuration file corresponding to CONFIG, a
<bootloader-configuration> object, and where the store is available at
STORE-FS, a <file-system> object. OLD-ENTRIES is taken to be a list of menu
diff --git a/gnu/system.scm b/gnu/system.scm
index 385d93150c..5732382a3a 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -962,6 +962,7 @@ entry."
a list of <menu-entry>, to populate the \"old entries\" menu."
(let* ((root-fs (operating-system-root-file-system os))
(root-device (file-system-device root-fs))
+ (locale (operating-system-locale os))
(params (operating-system-boot-parameters
os root-device
#:system-kernel-arguments? #t))
@@ -972,7 +973,8 @@ a list of <menu-entry>, to populate the \"old entries\" menu."
(bootloader-configuration-bootloader bootloader-conf)))
(generate-config-file bootloader-conf (list entry)
- #:old-entries old-entries)))
+ #:old-entries old-entries
+ #:locale locale)))
(define* (operating-system-boot-parameters os root-device
#:key system-kernel-arguments?)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 78aa6cf644..d3e0964aa9 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -492,6 +492,7 @@ STORE is an open connection to the store."
;; Make the specified system generation the default entry.
(params (profile-boot-parameters %system-profile (list number)))
+ (locale (boot-parameters-locale params))
(old-generations
(delv number (reverse (generation-numbers %system-profile))))
(old-params (profile-boot-parameters
@@ -503,7 +504,8 @@ STORE is an open connection to the store."
((bootcfg (lower-object
((bootloader-configuration-file-generator bootloader)
bootloader-config entries
- #:old-entries old-entries)))
+ #:old-entries old-entries
+ #:locale locale)))
(bootcfg-file -> (bootloader-configuration-file bootloader))
(target -> "/")
(drvs -> (list bootcfg)))
--
2.21.0
next prev parent reply other threads:[~2019-04-23 13:27 UTC|newest]
Thread overview: 22+ 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 ` Miguel [this message]
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-29 7:56 ` [bug#35394] [PATCH 0/3] Bootloader localization Ludovic Courtès
[not found] ` <20191021124035.531bed75@gmail.com>
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 ` [bug#35394] [PATCH 3/3] system: Use locale information in grub.cfg Miguel Arruga Vivas
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190423152628.53387a9b@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).