guix-commits
[Top][All Lists]
Advanced

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

branch master updated: file-systems: Always do recursive bind mounts.


From: guix-commits
Subject: branch master updated: file-systems: Always do recursive bind mounts.
Date: Sun, 20 Nov 2022 15:34:53 -0500

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

rekado pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new c585b4bc68 file-systems: Always do recursive bind mounts.
c585b4bc68 is described below

commit c585b4bc68813a351d6a87d19b9adf4041506355
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sat Nov 19 23:16:52 2022 +0100

    file-systems: Always do recursive bind mounts.
    
    Fixes <https://issues.guix.gnu.org/59185>.
    
    * guix/build/syscalls.scm (MS_REC): New variable.
    * gnu/build/file-systems.scm (mount-flags->bit-mask): Set MS_REC bit when
    bind-mounting.
---
 gnu/build/file-systems.scm | 2 +-
 guix/build/syscalls.scm    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 15b8f73312..66ca22d6ea 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -1127,7 +1127,7 @@ corresponds to the symbols listed in FLAGS."
       (('read-only rest ...)
        (logior MS_RDONLY (loop rest)))
       (('bind-mount rest ...)
-       (logior MS_BIND (loop rest)))
+       (logior MS_REC (logior MS_BIND (loop rest))))
       (('no-suid rest ...)
        (logior MS_NOSUID (loop rest)))
       (('no-dev rest ...)
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 61926beb80..2a12567b15 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -51,6 +51,7 @@
             MS_RELATIME
             MS_BIND
             MS_MOVE
+            MS_REC
             MS_SHARED
             MS_LAZYTIME
             MNT_FORCE
@@ -541,6 +542,7 @@ the last argument of `mknod'."
 (define MS_NODIRATIME      2048)
 (define MS_BIND            4096)
 (define MS_MOVE            8192)
+(define MS_REC            16384)
 (define MS_SHARED       1048576)
 (define MS_RELATIME     2097152)
 (define MS_STRICTATIME 16777216)



reply via email to

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