branch master updated: image: Use 512 byte blocks for EFI partitions.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 45f5feb279 image: Use 512 byte blocks for EFI partitions.
45f5feb279 is described below

commit 45f5feb279860cde0d8032f05c3e5b45588b9609
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Dec 12 10:27:40 2022 +0200

    image: Use 512 byte blocks for EFI partitions.
    
    Addresses <https://issues.guix.gnu.org/59695>.
    
    * gnu/build/image.scm (make-vfat-image): When creating a fat filesystem
    for UEFI bootable partition use 512 byte blocks.
---
 gnu/build/image.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 2327cfbb45..65a0373980 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -111,7 +111,10 @@ turn doesn't take any constant overhead into account, 
force a 1-MiB minimum."
                            (if (eq? size 'guess)
                                (estimate-partition-size root)
                                size))
-                    (if (member 'esp flags) (list "-S" "1024") '()))
+                    ;; u-boot in particular needs the formatted block
+                    ;; size and the physical block size to be equal.
+                    ;; TODO: What about 4k blocks?
+                    (if (member 'esp flags) (list "-S" "512") '()))
     (for-each (lambda (file)
                 (unless (member file '("." ".."))
                   (invoke "mcopy" "-bsp" "-i" target