diff options
author | Maxim Cournoyer <[email protected]> | 2022-09-27 14:24:37 -0400 |
---|---|---|
committer | Maxim Cournoyer <[email protected]> | 2022-09-27 14:27:28 -0400 |
commit | 3c6e220d8100281074c414a43c1efe9a01b53771 (patch) | |
tree | dc5d47fbbac3842d0da893adcd398dea10c1e681 /gnu/system/file-systems.scm | |
parent | 08473753a0ebafef22c0894d846e3b42fd6be2a2 (diff) | |
parent | 62048ff9fcfbe3fc790a7207fc5f6f3e0476a02a (diff) |
Merge branch 'master' into staging.
With resolved conflicts in:
gnu/local.mk
gnu/packages/crates-io.scm
Diffstat (limited to 'gnu/system/file-systems.scm')
-rw-r--r-- | gnu/system/file-systems.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 464b76a2ca..f2eb2e0837 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -434,7 +434,7 @@ TARGET in the other system." (define %pseudo-file-system-types ;; List of know pseudo file system types. This is used when validating file ;; system definitions. - '("binfmt_misc" "cgroup" "debugfs" "devpts" "devtmpfs" "efivarfs" "fusectl" + '("binfmt_misc" "cgroup" "cgroup2" "debugfs" "devpts" "devtmpfs" "efivarfs" "fusectl" "hugetlbfs" "overlay" "proc" "securityfs" "sysfs" "tmpfs")) (define %fuse-control-file-system |