aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Ángel Arruga Vivas <rosen644835@gmail.com>2020-10-24 17:48:28 +0200
committerMiguel Ángel Arruga Vivas <rosen644835@gmail.com>2020-10-30 22:33:58 +0100
commitc69a1c27ee3f1966d1c4b83a87a4f93356a7bb81 (patch)
treede0b873b29ac24177cf62c891a900d2529b0f78c
parenta07717cc8bdde665ee577eb2b008865fbf768533 (diff)
downloadguix-c69a1c27ee3f1966d1c4b83a87a4f93356a7bb81.tar
guix-c69a1c27ee3f1966d1c4b83a87a4f93356a7bb81.tar.gz
system: Fix grub keymap with store in btrfs subvolume.
* gnu/bootloader/grub.scm (grub-configuration-file) [keyboard-layout-config]: Use normalize-file.
-rw-r--r--gnu/bootloader/grub.scm9
1 files 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