diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-08 23:58:22 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-08 23:58:22 +0200 |
| commit | 873325b0307a709be6f305472a5bfb9e07437aaa (patch) | |
| tree | b271f28b229f983841ca7b16c4d3cc52582c864e /gnu/system/examples | |
| parent | 68ee10da03b09c2acead8891e4b51c718c24d574 (diff) | |
| parent | 6a8299d267d111da4c80bbdfc83eb5cdfc072b4a (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/examples')
| -rw-r--r-- | gnu/system/examples/bare-bones.tmpl | 5 | ||||
| -rw-r--r-- | gnu/system/examples/desktop.tmpl | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index cb6d2623db..b763258e52 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -10,8 +10,9 @@ (timezone "Europe/Berlin") (locale "en_US.utf8") - ;; Assuming /dev/sdX is the target hard disk, and "my-root" is - ;; the label of the target root file system. + ;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the + ;; target hard disk, and "my-root" is the label of the target + ;; root file system. (bootloader (bootloader-configuration (bootloader grub-bootloader) (target "/dev/sdX"))) diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index e8740407d0..ea21e1df66 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -11,11 +11,11 @@ (timezone "Europe/Paris") (locale "en_US.utf8") - ;; Assuming /dev/sdX is the target hard disk, and "my-root" - ;; is the label of the target root file system. + ;; Use the UEFI variant of GRUB with the EFI System + ;; Partition mounted on /boot/efi. (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (target "/dev/sdX"))) + (bootloader grub-efi-bootloader) + (target "/boot/efi"))) ;; Specify a mapped device for the encrypted root partition. ;; The UUID is that returned by 'cryptsetup luksUUID'. |