guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: system: image: Do not produce an HFS tree when bu


From: guix-commits
Subject: branch master updated: system: image: Do not produce an HFS tree when building an ISO.
Date: Fri, 12 Jun 2020 11:21:41 -0400

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

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new fd1e885  system: image: Do not produce an HFS tree when building an 
ISO.
fd1e885 is described below

commit fd1e885236fcec0aec1e3293153524f02b010560
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Thu Jun 11 15:25:02 2020 +0200

    system: image: Do not produce an HFS tree when building an ISO.
    
    Use "mbr_only" mode to make sure that no HFS+ tree are generated.
    
    * gnu/system/image.scm (system-image): Set MKRESCUE_SED_MODE to "mbr_only".
---
 gnu/system/image.scm | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index a0e6bf3..6c45735 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -538,14 +538,23 @@ image, depending on IMAGE format."
                           #:inputs `(("system" ,os)
                                      ("bootcfg" ,bootcfg))))
       ((iso9660)
-       (system-iso9660-image image*
-                             #:bootcfg bootcfg
-                             #:bootloader bootloader
-                             #:register-closures? register-closures?
-                             #:inputs `(("system" ,os)
-                                        ("bootcfg" ,bootcfg))
-                             #:grub-mkrescue-environment
-                             '(("MKRESCUE_SED_MODE" . "mbr_hfs")))))))
+       (system-iso9660-image
+        image*
+        #:bootcfg bootcfg
+        #:bootloader bootloader
+        #:register-closures? register-closures?
+        #:inputs `(("system" ,os)
+                   ("bootcfg" ,bootcfg))
+        ;; Make sure to use a mode that does no imply
+        ;; HFS+ tree creation that may fail with:
+        ;;
+        ;; "libisofs: FAILURE : Too much files to mangle,
+        ;; cannot guarantee unique file names"
+        ;;
+        ;; This happens if some limits are exceeded, see:
+        ;; https://lists.gnu.org/archive/html/grub-devel/2020-06/msg00048.html
+        #:grub-mkrescue-environment
+        '(("MKRESCUE_SED_MODE" . "mbr_only")))))))
 
 (define (find-image file-system-type)
   "Find and return an image that could match the given FILE-SYSTEM-TYPE.  This



reply via email to

[Prev in Thread] Current Thread [Next in Thread]