--- Begin Message ---
Subject: |
[PATCH] linux-boot: Don't ignore flags when mounting root file system. |
Date: |
Mon, 2 Dec 2019 21:57:34 +0100 |
* gnu/build/linux-boot.scm (mount-root-file-system): Add the 'flags' keyword
argument and use it when mounting the root file system.
(boot-system): Pass the root file system flags to 'mount-root-file-system'.
---
gnu/build/linux-boot.scm | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 950a3507f2..fcec751f45 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -358,10 +358,10 @@ the last argument of `mknod'."
(filter-map string->number (scandir "/proc")))))
(define* (mount-root-file-system root type
- #:key volatile-root? options)
- "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. OPTIONS indicates the options to use
+ #:key volatile-root? (flags 0) options)
+ "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."
(if volatile-root?
@@ -384,7 +384,7 @@ to mount ROOT."
"lowerdir=/real-root,upperdir=/rw-root/upper,workdir=/rw-root/work"))
(begin
(check-file-system root type)
- (mount root "/root" type 0 options)))
+ (mount root "/root" type flags options)))
;; Make sure /root/etc/mtab is a symlink to /proc/self/mounts.
(false-if-exception
@@ -474,6 +474,13 @@ upon error."
mounts)
"ext4"))
+ (define root-fs-flags
+ (mount-flags->bit-mask (or (any (lambda (fs)
+ (and (root-mount-point? fs)
+ (file-system-flags fs)))
+ mounts)
+ 0)))
+
(define root-fs-options
(any (lambda (fs)
(and (root-mount-point? fs)
@@ -533,6 +540,7 @@ upon error."
(mount-root-file-system (canonicalize-device-spec root)
root-fs-type
#:volatile-root? volatile-root?
+ #:flags root-fs-flags
#:options root-fs-options))
(mount "none" "/root" "tmpfs"))
--
2.24.0
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#38462] [PATCH] linux-boot: Don't ignore flags when mounting root file system. |
Date: |
Mon, 09 Dec 2019 15:53:58 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) |
Guillaume Le Vaillant <address@hidden> skribis:
> * gnu/build/linux-boot.scm (mount-root-file-system): Add the 'flags' keyword
> argument and use it when mounting the root file system.
> (boot-system): Pass the root file system flags to 'mount-root-file-system'.
This was pushed as 900ef20b1da66ad71145082c883dc12f31fafa54, closing!
Ludo’.
--- End Message ---