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/desktop.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/system/examples/desktop.tmpl') diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index 8b02659478..3cfbd9add6 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -13,19 +13,20 @@ ;; Assuming /dev/sdX is the target hard disk, and "my-root" ;; is the label of the target root file system. - (bootloader (grub-configuration (device "/dev/sdX"))) + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (device "/dev/sdX"))) ;; Specify a mapped device for the encrypted root partition. ;; The UUID is that returned by 'cryptsetup luksUUID'. (mapped-devices (list (mapped-device (source (uuid "12345678-1234-1234-1234-123456789abc")) - (target "the-root-device") + (target "my-root") (type luks-device-mapping)))) (file-systems (cons (file-system (device "my-root") - (title 'label) (mount-point "/") (type "ext4") (dependencies mapped-devices)) -- cgit v1.2.3