From b310cb18021e421be3256b85ab3f2d8f61fe0ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= Date: Sat, 24 Oct 2020 17:48:28 +0200 Subject: [PATCH 1/2] system: Fix grub keymap with store in btrfs subvolume. * gnu/bootloader/grub.scm (grub-configuration-file) [keyboard-layout-config]: Use normalize-file. --- gnu/bootloader/grub.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 611580a350..f1479024e6 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -421,11 +421,12 @@ set lang=~a~%" locale)))) (bootloader-configuration-bootloader config))) (keymap* (and layout (keyboard-layout-file layout #:grub grub))) + (entry (first all-entries)) + (device (menu-entry-device entry)) + (mount-point (menu-entry-device-mount-point entry)) (keymap (and keymap* - (if store-directory-prefix - #~(string-append #$store-directory-prefix - #$keymap*) - keymap*)))) + (normalize-file keymap* mount-point + store-directory-prefix)))) #~(when #$keymap (format port "\ insmod keylayouts -- 2.28.0