From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7zlU-0001Qm-0v for guix-patches@gnu.org; Sun, 24 Mar 2019 05:50:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7zlS-0007Z8-Ru for guix-patches@gnu.org; Sun, 24 Mar 2019 05:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42475) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h7zlS-0007Yz-MV for guix-patches@gnu.org; Sun, 24 Mar 2019 05:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h7zlS-0008SB-Jk for guix-patches@gnu.org; Sun, 24 Mar 2019 05:50:02 -0400 Subject: [bug#34929] [PATCH 04/12] bootloader: Add a 'keyboard-layout' field. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:47083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7zkq-0000hg-8Q for guix-patches@gnu.org; Sun, 24 Mar 2019 05:49:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7zVA-0000kp-BZ for guix-patches@gnu.org; Sun, 24 Mar 2019 05:33:13 -0400 Received: from lepiller.eu ([2a00:5884:8208::1]:42764) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h7zVA-0000Rr-2S for guix-patches@gnu.org; Sun, 24 Mar 2019 05:33:12 -0400 Received: from localhost (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 89cbd5db (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sun, 24 Mar 2019 09:32:03 +0000 (UTC) Date: Sun, 24 Mar 2019 10:31:57 +0100 From: Julien Lepiller Message-ID: <20190324103157.3493634f@lepiller.eu> In-Reply-To: <20190320230435.25458-4-ludo@gnu.org> References: <20190320230435.25458-1-ludo@gnu.org> <20190320230435.25458-4-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34929@debbugs.gnu.org Le Thu, 21 Mar 2019 00:04:27 +0100, Ludovic Court=C3=A8s a =C3=A9crit : > * gnu/bootloader/grub.scm (keyboard-layout-file): New procedure. > (grub-configuration-file)[keyboard-layout-file]: New variable. > [builder]: Use it. > * gnu/bootloader.scm ()[keyboard-layout]: > New field. > * doc/guix.texi (Bootloader Configuration): Document it. >=20 > Co-authored-by: nee > --- > doc/guix.texi | 28 ++++++++++++++++++++++++++++ > gnu/bootloader.scm | 3 +++ > gnu/bootloader/grub.scm | 35 +++++++++++++++++++++++++++++++++++ > 3 files changed, 66 insertions(+) >=20 > diff --git a/doc/guix.texi b/doc/guix.texi > index 63581bbe41..c687f78eac 100644 > --- a/doc/guix.texi > +++ b/doc/guix.texi > @@ -23134,6 +23134,34 @@ current system. > The number of seconds to wait for keyboard input before booting. > Set to 0 to boot immediately, and to -1 to wait indefinitely. > =20 > +@cindex keyboard layout, for the bootloader > +@item @code{keyboard-layout} (default: @code{#f}) > +If this is @code{#f}, the bootloader's menu (if any) uses the > default keyboard +layout, usually US@tie{}English (``qwerty''). > + > +Otherwise, this must be a @code{keyboard-layout} object. For > instance, the +following example defines a standard German keyboard > layout: + > +@example > +(keyboard-layout "de") > +@end example > + > +@noindent > +while the example below designates the b=C3=A9po layout for French: > + > +@example > +(keyboard-layout "fr" "bepo") > +@end example I think these examples are a bit confusing, because they could be interpreted as: (bootloader (bootloader-configuration (target "/boot/efi") (bootloader grub-efi-bootloader) (keyboard-layout "fr" "bepo"))) as well as: (bootloader (bootloader-configuration (target "/boot/efi") (bootloader grub-efi-bootloader) (keyboard-layout (keyboard-layout "fr" "bepo")))) and I think you mean the second one, but the first one is the one that comes immediately to mind when reading the manual. Maybe you could add the full example? > + > +The layout name and variant must match an existing layout in the > +@code{xkeyboard-config} package under the > @file{share/X11/xkb/symbols} +directory. > + > +@quotation Note > +This option is currently ignored by bootloaders other than > @code{grub} and +@code{grub-efi}. > +@end quotation > + > @item @code{theme} (default: @var{#f}) > The bootloader theme object describing the theme to use. If no theme > is provided, some bootloaders might use a default theme, that's true > diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm > index e48bcc073c..e7f7331dd8 100644 > --- a/gnu/bootloader.scm > +++ b/gnu/bootloader.scm > @@ -47,6 +47,7 @@ > bootloader-configuration-menu-entries > bootloader-configuration-default-entry > bootloader-configuration-timeout > + bootloader-configuration-keyboard-layout > bootloader-configuration-theme > bootloader-configuration-terminal-outputs > bootloader-configuration-terminal-inputs > @@ -113,6 +114,8 @@ > (default 0)) > (timeout bootloader-configuration-timeout ;seconds as > integer (default 5)) > + (keyboard-layout > bootloader-configuration-keyboard-layout ;string | #f I think you mean " | #f" > + (default #f)) The rest of the patch lgtm :)