01/02: linux-boot: Ensure volatile root is mounted read-only.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit cc9b889e8f285719645b5a86f2583d7f1b2aef01
Author: Maxim Cournoyer <address@hidden>
AuthorDate: Tue Feb 11 12:57:29 2020 -0500

    linux-boot: Ensure volatile root is mounted read-only.
    
    * gnu/build/linux-boot.scm (mount-root-file-system): Ensure MS_RDONLY is
    present among the root file system flags when VOLATILE-ROOT? is #t.
---
 gnu/build/linux-boot.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 3d40a7d..4fb711b 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -362,12 +362,12 @@ the last argument of `mknod'."
   "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is
 true, mount ROOT read-only and make it an overlay with a writable tmpfs using
 the kernel built-in overlayfs. FLAGS and OPTIONS indicates the options to use
-to mount ROOT."
+to mount ROOT, and behave the same as for the `mount' procedure."
 
   (if volatile-root?
       (begin
         (mkdir-p "/real-root")
-        (mount root "/real-root" type MS_RDONLY options)
+        (mount root "/real-root" type (logior MS_RDONLY flags) options)
         (mkdir-p "/rw-root")
         (mount "none" "/rw-root" "tmpfs")