[Top][All Lists]

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

07/10: gnu: linux-boot: Filter out file system independent options.

From: guix-commits
Subject: 07/10: gnu: linux-boot: Filter out file system independent options.
Date: Fri, 14 Feb 2020 10:55:38 -0500 (EST)

apteryx pushed a commit to branch allow-booting-from-btrfs-subvolume
in repository guix.

commit cb060af5ea56427e1fd63ced5f9c9edd3ae61f76
Author: Maxim Cournoyer <address@hidden>
AuthorDate: Tue Feb 11 14:27:19 2020 -0500

    gnu: linux-boot: Filter out file system independent options.
    This fixes an issue where options such as "defaults", which are understood 
    the command line program "mount", are not understood by the system call of 
    same name, which is used in the initial RAM disk.
    * gnu/system/file-systems.scm (%file-system-independent-mount-options): New 
    (file-system-independent-mount-option?): New predicate.
    * gnu/build/linux-boot.scm (boot-system): Use the above predicate to filter
    out system independent mount options.
 gnu/build/linux-boot.scm    |  3 ++-
 gnu/system/file-systems.scm | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index f65e942..8e55797 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -490,7 +490,8 @@ upon error."
                              (or (and=> root-fs file-system-flags)
              (root-fs-options (if root-fs
-                                  (file-system-options root-fs)
+                                  (remove file-system-independent-mount-option?
+                                          (file-system-options root-fs))
              ;; --root-options takes precedence over the 'options' field of the
              ;; root <file-system> record.
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index 6dc0e68..2c3c159 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -46,6 +46,7 @@
+            file-system-independent-mount-option?
@@ -565,4 +566,20 @@ system has the given TYPE."
   (lambda (fs)
     (string=? (file-system-type fs) type)))
+(define %file-system-independent-mount-options
+  ;; Taken from 'man 8 mount'.
+  '("async" "atime" "auto" "noatime" "noauto" "context" "defaults" "dev" 
+    "diratime" "nodiratime" "dirsync" "exec" "noexec" "group" "iversion"
+    "noiversion" "mand" "nomand" "_netdev" "nofail" "relatime" "norelatime"
+    "strictatime" "nostrictatime" "lazytime" "nolazytime" "suid" "nosuid"
+    "silent" "loud" "owner" "remount" "ro" "rw" "sync" "user" "nouser" 
+(define (file-system-independent-mount-option? option)
+  "Predicate to check if a <file-system> option is file system independent."
+  (let ((option-name (if (pair? option)
+                         (car option)
+                         option)))
+    (or (string-prefix-ci? "x-" option-name)
+        (member option-name %file-system-independent-mount-options))))
 ;;; file-systems.scm ends here

reply via email to

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