03/05: gnu: singularity: Do not use the "errors=remount-ro" squashfs option.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit e0dbed64c530916ab600f193f5f6f6ad6177f7b3
Author: Ludovic Courtès <address@hidden>
AuthorDate: Thu Mar 12 16:38:44 2020 +0100

    gnu: singularity: Do not use the "errors=remount-ro" squashfs option.
    
    This mount option stopped being supported with Linux-libre 5.4.5:
    
      http://ci.guix.gnu.org/build/2056359/details
    
    * gnu/packages/linux.scm (singularity)[source]: Remove
    "errors=remount-ro" mount option from source code.
---
 gnu/packages/linux.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e864e17..0198622 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3482,6 +3482,12 @@ thanks to the use of namespaces.")
                       _ program)
                      (string-append "/run/setuid-programs/singularity-"
                                     program "-helper")))
+
+                  ;; These squashfs mount options are apparently no longer
+                  ;; supported since Linux-libre 5.4.5.
+                  (substitute* "src/lib/image/squashfs/mount.c"
+                    (("\"errors=remount-ro\"")
+                     "NULL"))
                   #t))))
     (build-system gnu-build-system)
     (arguments