aboutsummaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorAndy Wingo <wingo@igalia.com>2017-08-20 10:48:19 +0200
committerAndy Wingo <wingo@igalia.com>2017-08-20 11:16:42 +0200
commit2941b347b664a3d3114de0ac95e28db78db66144 (patch)
tree7615f881b2d26ec94692c975f4b0d7c28da8214b /gnu/system
parent97291c0c7c6bc50aa503f9bf7f9abd97cffae9c9 (diff)
downloadguix-2941b347b664a3d3114de0ac95e28db78db66144.tar
guix-2941b347b664a3d3114de0ac95e28db78db66144.tar.gz
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.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/examples/bare-bones.tmpl4
-rw-r--r--gnu/system/examples/desktop.tmpl7
-rw-r--r--gnu/system/examples/lightweight-desktop.tmpl7
3 files changed, 11 insertions, 7 deletions
diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl
index f7b8823d4f..a10ee6e7fe 100644
--- a/gnu/system/examples/bare-bones.tmpl
+++ b/gnu/system/examples/bare-bones.tmpl
@@ -12,7 +12,9 @@
;; 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")))
(file-systems (cons (file-system
(device "my-root")
(title 'label)
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))
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