From 50fcf37c13bf0636d380b51db1c47d708641e9ca Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 4 Oct 2017 09:10:42 +0200
Subject: doc: Give an example with a FAT UUID.

* gnu/system/examples/lightweight-desktop.tmpl <file-systems>: Add a
UUID for the /boot/efi partition.
* doc/guix.texi (Using the Configuration System): Mention it.
---
 doc/guix.texi                                | 5 +++++
 gnu/system/examples/lightweight-desktop.tmpl | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 7b5b711793..0940ea4e71 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8406,6 +8406,7 @@ management, power management, and more, would look like this:
 @include os-config-desktop.texi
 @end lisp
 
+@cindex UEFI
 A graphical UEFI system with a choice of lightweight window managers
 instead of full-blown desktop environments would look like this:
 
@@ -8413,6 +8414,10 @@ instead of full-blown desktop environments would look like this:
 @include os-config-lightweight-desktop.texi
 @end lisp
 
+This example refers to the @file{/boot/efi} partition by its UUID,
+@code{1234-ABCD}.  Replace this UUID with the right UUID on your system,
+as returned by the @command{blkid} command.
+
 @xref{Desktop Services}, for the exact list of services provided by
 @var{%desktop-services}.  @xref{X.509 Certificates}, for background
 information about the @code{nss-certs} package that is used here.
diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl
index fb7cfebf6d..d13c04c76c 100644
--- a/gnu/system/examples/lightweight-desktop.tmpl
+++ b/gnu/system/examples/lightweight-desktop.tmpl
@@ -17,16 +17,16 @@
                 (bootloader grub-efi-bootloader)
                 (target "/boot/efi")))
 
-  ;; Assume the target root file system is labelled "my-root".
+  ;; Assume the target root file system is labelled "my-root",
+  ;; and the EFI System Partition has UUID 1234-ABCD.
   (file-systems (cons* (file-system
                          (device "my-root")
                          (title 'label)
                          (mount-point "/")
                          (type "ext4"))
                        (file-system
-                         ;; Specify partition here since FAT
-                         ;; labels are currently unsupported.
-                         (device "/dev/sda1")
+                         (device (uuid "1234-ABCD" 'fat))
+                         (title 'uuid)
                          (mount-point "/boot/efi")
                          (type "vfat"))
                        %base-file-systems))
-- 
cgit v1.2.3