m1gu3l pushed a commit to branch master
in repository guix.
commit c69a1c27ee3f1966d1c4b83a87a4f93356a7bb81
Author: Miguel Ángel Arruga Vivas <[email protected]>
AuthorDate: Sat Oct 24 17:48:28 2020 +0200
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 611580a..f147902 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
