From patchwork Fri Apr 26 10:51:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Miguel Arruga Vivas X-Patchwork-Id: 13756 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8AE6216F48; Fri, 26 Apr 2019 11:52:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 015F716F46 for ; Fri, 26 Apr 2019 11:52:16 +0100 (BST) Received: from localhost ([127.0.0.1]:44698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJySl-0003Sz-LE for patchwork@mira.cbaines.net; Fri, 26 Apr 2019 06:52:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJySi-0003SY-7X for guix-patches@gnu.org; Fri, 26 Apr 2019 06:52:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJySe-00028O-CH for guix-patches@gnu.org; Fri, 26 Apr 2019 06:52:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46598) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hJySY-00024u-Lo for guix-patches@gnu.org; Fri, 26 Apr 2019 06:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hJySY-0004aY-D3 for guix-patches@gnu.org; Fri, 26 Apr 2019 06:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35394] [PATCH 4/4] system: Use locale information in grub.cfg. References: <20190423151702.05258473@gmail.com> In-Reply-To: <20190423151702.05258473@gmail.com> Resent-From: Miguel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Apr 2019 10:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35394@debbugs.gnu.org Received: via spool by 35394-submit@debbugs.gnu.org id=B35394.155627589517604 (code B ref 35394); Fri, 26 Apr 2019 10:52:02 +0000 Received: (at 35394) by debbugs.gnu.org; 26 Apr 2019 10:51:35 +0000 Received: from localhost ([127.0.0.1]:60142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hJyS7-0004Zs-96 for submit@debbugs.gnu.org; Fri, 26 Apr 2019 06:51:35 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:34263) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hJyS6-0004Ze-8s for 35394@debbugs.gnu.org; Fri, 26 Apr 2019 06:51:34 -0400 Received: by mail-wr1-f45.google.com with SMTP id v16so1417139wrp.1 for <35394@debbugs.gnu.org>; Fri, 26 Apr 2019 03:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version; bh=aEXMf1lEG1Gq4nKTwqrLyvq/Wj9HnxpqMStu8bmuW5I=; b=WwR3T6QnKgkRh8o8A/Q1rfhcX6PFwynMAkUmowRQO0xMIO8ovU9NJeYPCVH+Cpp6du yHM9+E4GM4aFjG7QAGz7YglvwW9QtN+04Uhzf/UlzW3/cfkl2Vv4JrZU7CedhtZS0fq7 lBDDmx+WB0FlskshYwAY30yWmtb9q/HnzV+6ZIaz2lkdThWirklpP0hJxZG4KF5Gd4a+ 1cwS28r8XmaJueN4xfcd6o76Em2G91Llfz0T9l/WJx4HE+u7/Zk+LXLTZp9CyJh84k6m yFYB7/vkfl99GAc2bvpuFRM6Gy15WZtNB5zlKq6UpDYEAoJ11OTM+oZOpYBpJ8PpdRII Tn4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version; bh=aEXMf1lEG1Gq4nKTwqrLyvq/Wj9HnxpqMStu8bmuW5I=; b=Fp259MNZuEvS/zbz1wphqziwSVDgryujfic0NuK0Yf1pP00d+fkLpE3qxoXUwxFhBm npYMfNyq/ihbLYFJ+LZE488uTKkIxItrdtyMljnVOCrOz7ydQeg9qxmDHl8g/ythC4mb YchA+0fM5/Gzaw0lDoQNV5fpuzwZY4x7E0cler7/+Z14VehoKZam8C1uj4rsfczWS1Sa qYIUDSNc4NOtj8Z3yLI4EEQtHDaRvt8SlVwpv9ZoaWi9j0R1umBpEty9Y3oEBh8dCpBG SU1mWpjmgHXjSdtt/suXV4jU+5eKgDnMfRvEbCSEIY7Frqix22L+E5XwD5fj0eHTsog6 hung== X-Gm-Message-State: APjAAAWsaatF1sPdLK1I2yLy+zpshIA3X2rkvdK2V5J+v9H3HkvYmYSV S7xC6nzmGazJ8DlKWzhWF6hDTFbr/Tg= X-Google-Smtp-Source: APXvYqwWQceFlovM9hD+aC+6BOPpO+V08ZOiEyafz/vPBnJB3Os9rG1KLZ8/42+4Oe0LinRWkKiIOA== X-Received: by 2002:a5d:5382:: with SMTP id d2mr18435539wrv.78.1556275887222; Fri, 26 Apr 2019 03:51:27 -0700 (PDT) Received: from localhost (19.49.134.37.dynamic.jazztel.es. [37.134.49.19]) by smtp.gmail.com with ESMTPSA id g185sm12079639wmf.30.2019.04.26.03.51.26 for <35394@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Apr 2019 03:51:26 -0700 (PDT) Date: Fri, 26 Apr 2019 12:51:23 +0200 From: Miguel Message-ID: <20190426125123.22f810f4@gmail.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches system: Use locale information in grub.cfg. * gnu/bootloader/grub.scm (module-declaration): Add (gnu system locale). (locale-config-entries): New procedure. (grub-configuration-file): Use locale-config-entries. --- gnu/bootloader/grub.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) From 216f818bb27d3c491681c4d67e483279c3065b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= Date: Fri, 26 Apr 2019 11:58:43 +0200 Subject: [PATCH 4/4] system: Use locale information in grub.cfg. * gnu/bootloader/grub.scm (module-declaration): Add (gnu system locale). (locale-config-entries): New procedure. (grub-configuration-file): Use locale-config-entries. --- gnu/bootloader/grub.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 446f90157c..92c33063c3 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2019 Miguel Ángel Arruga Vivas ;;; ;;; 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) @@ -216,6 +218,27 @@ fi~%" #$(theme-colors grub-theme-color-normal) #$(theme-colors grub-theme-color-highlight)))) +(define* (locale-config-entries config store-mount-point #:key locale port) + "Return a gexp that writes to PORT (a port-valued gexp) the +'grub.cfg' part concerned with locale configuration." + (define grub (bootloader-package + (bootloader-configuration-bootloader config))) + (define (locale-dir) + #~(let ((dir #$grub:locale)) + dir)) + (define (lang-id) + (let ((definition (locale-name->definition locale))) + (locale-definition-source definition))) + + (and locale + (member "locale" (package-outputs grub)) + #~(format #$port " +# Configure GRUB with the selected locale. +set locale_dir=~a +set lang=~a~%" + #$(strip-mount-point store-mount-point (locale-dir)) + #$(lang-id)))) + ;;; ;;; Configuration file. @@ -364,6 +387,10 @@ entries corresponding to old generations of the system." terminal_input at_keyboard insmod keylayouts keymap ~a~%" keymap))))) + (define locale-config + (locale-config-entries config + (menu-entry-device-mount-point (first all-entries)) + #:locale locale #:port #~port)) (define builder #~(call-with-output-file #$output @@ -374,6 +401,7 @@ keymap ~a~%" keymap))))) ") #$sugar #$keyboard-layout-config + #$locale-config (format port " set default=~a set timeout=~a~%" -- 2.21.0