summary refs log tree commit diff
path: root/nixos/modules/tasks/filesystems.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-02-09 08:42:04 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-02-09 08:42:04 +0100
commit6bea415b5e3f4ab70afcea4c646ad76d9c073c89 (patch)
tree8f5e976cd8aecc6029b4019e16f0177e0a66a093 /nixos/modules/tasks/filesystems.nix
parentb846a53d2a3cba3002a4d6fb064f579677eac52c (diff)
parent4bf9f8afc39e9d0c0629635652804b81fe3e3332 (diff)
downloadnixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.gz
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.bz2
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.lz
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.xz
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.tar.zst
nixlib-6bea415b5e3f4ab70afcea4c646ad76d9c073c89.zip
Merge branch 'master' into staging
Diffstat (limited to 'nixos/modules/tasks/filesystems.nix')
-rw-r--r--nixos/modules/tasks/filesystems.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 49ba66ad50af..8bd35385739e 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -216,7 +216,7 @@ in
 
     environment.etc.fstab.text =
       let
-        fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" ];
+        fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ];
         skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
       in ''
         # This is a generated file.  Do not edit!