summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2025-10-27 04:11:20 +0100
committerLudovic Courtès <ludo@gnu.org>2025-11-06 23:29:46 +0100
commit08db14c74f5d0608f70f87c0cdbcb80fd0a499f5 (patch)
tree42eaf19a9660704d2d42ebecc5d29b055f200aae /gnu
parentb2a6f65753aa6ec15c630f2285f9bae4de84e13e (diff)
file-systems: Support the 'remount' mount flag.
This allows remounting file systems which are already mounted by the initrd with custom mount options (e.g. /proc with hidepid=2). * gnu/build/file-systems.scm (mount-flags->bit-mask): Map 'remount to MS_REMOUNT. * gnu/system/file-systems.scm (invalid-file-system-flags): Add 'remount to the list of KNOWN-FLAGS. * doc/guix.texi (File Systems): Document it. Fixes: guix/guix#3849 Change-Id: I0ab116a5b4f7bd201e955ecf022e260c63828dc4 Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/build/file-systems.scm2
-rw-r--r--gnu/system/file-systems.scm2
2 files changed, 3 insertions, 1 deletions
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 1ff954583a7..d25b798b117 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -1312,6 +1312,8 @@ corresponds to the symbols listed in FLAGS."
1312 (logior MS_STRICTATIME (loop rest))) 1312 (logior MS_STRICTATIME (loop rest)))
1313 (('lazy-time rest ...) 1313 (('lazy-time rest ...)
1314 (logior MS_LAZYTIME (loop rest))) 1314 (logior MS_LAZYTIME (loop rest)))
1315 (('remount rest ...)
1316 (logior MS_REMOUNT (loop rest)))
1315 (('shared rest ...) 1317 (('shared rest ...)
1316 (loop rest)) 1318 (loop rest))
1317 (() 1319 (()
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index f4086dd62b7..f83b67c4770 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -123,7 +123,7 @@
123 ;; Note: Keep in sync with 'mount-flags->bit-mask'. 123 ;; Note: Keep in sync with 'mount-flags->bit-mask'.
124 (let ((known-flags '(read-only 124 (let ((known-flags '(read-only
125 bind-mount no-suid no-dev no-exec 125 bind-mount no-suid no-dev no-exec
126 no-atime no-diratime strict-atime lazy-time 126 no-atime no-diratime strict-atime lazy-time remount
127 shared))) 127 shared)))
128 (lambda (flags) 128 (lambda (flags)
129 "Return the subset of FLAGS that is invalid." 129 "Return the subset of FLAGS that is invalid."