From e0dbed64c530916ab600f193f5f6f6ad6177f7b3 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludovic.courtes@inria.fr>
Date: Thu, 12 Mar 2020 16:38:44 +0100
Subject: 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(+)

(limited to 'gnu')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e864e17800..01986222e8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3482,6 +3482,12 @@ (define-public singularity
                       _ 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
-- 
cgit v1.2.3