01/05: image: Remove conflicting user-provided EFI file system.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 1ec366cdfd92e4913ab7d1096520410272e3c89c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Nov 10 23:09:59 2020 -0500

    image: Remove conflicting user-provided EFI file system.
    
    When the image type is "raw" or derived from it (such as "qcow2"), an ESP
    partition and file system is already added by the image generator.  If a
    conflicting user-provided EFI file system is provided, it causes the boot to
    fail, as happens for the lightweight-desktop.tmpl and desktop.tmpl templates
    under gnu/system/examples.
    
    * gnu/system/image.scm (operating-system-for-image): Remove file systems 
whose
    mount point is "/boot/efi".
---
 gnu/system/image.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 81152f0..4972d90 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -576,7 +576,9 @@ it can be used for bootloading."
          (file-systems-to-keep
           (srfi-1:remove
            (lambda (fs)
-             (string=? (file-system-mount-point fs) "/"))
+             (let ((mount-point (file-system-mount-point fs)))
+               (or (string=? mount-point "/")
+                   (string=? mount-point "/boot/efi"))))
            (operating-system-file-systems base-os)))
          (format (image-format image))
          (os