From 2941b347b664a3d3114de0ac95e28db78db66144 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 20 Aug 2017 10:48:19 +0200 Subject: gnu: grub-efi-bootloader: Specialize grub-install invocation. * gnu/bootloader/grub.scm (install-grub-efi): Fix grub-install invocation for EFI systems. * gnu/system/examples/bare-bones.tmpl: Use the newer "bootloader-configuration" syntax. * gnu/system/examples/desktop.tmpl: Use bootloader-configuration sytax. Also, use the same label for the LUKS-mapped device and the root partition. Remove unneeded "title" field for the file-system based on LUKS; as noted in the manual, the "title" field is ignored for mapped devices. * gnu/system/examples/lightweight-desktop.tmpl: Use bootloader-configuration, and use grub-efi-bootloader. --- gnu/system/examples/lightweight-desktop.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/system/examples/lightweight-desktop.tmpl') diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl index 6fb6283d29..127ceb4dc5 100644 --- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl @@ -12,9 +12,10 @@ (locale "en_US.utf8") ;; Use the UEFI variant of GRUB with the EFI System - ;; Partition on /dev/sda1. - (bootloader (grub-configuration (grub grub-efi) - (device "/dev/sda1"))) + ;; Partition mounted on /boot/efi. + (bootloader (bootloader-configuration + (bootloader grub-efi-bootloader) + (device "/boot/efi"))) ;; Assume the target root file system is labelled "my-root". (file-systems (cons* (file-system -- cgit v1.2.3