Skip to content

Commit

Permalink
Include cifs-utils only when needed
Browse files Browse the repository at this point in the history
Issue #7117.
  • Loading branch information
edolstra committed Apr 19, 2015
1 parent 1cb5583 commit 2b6d011
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion nixos/modules/profiles/base.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@
];

# Include support for various filesystems.
boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "zfs" "ntfs" ];
boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "zfs" "ntfs" "cifs" ];

}
2 changes: 1 addition & 1 deletion nixos/modules/tasks/filesystems/cifs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ in
{
config = {

system.fsPackages = [ pkgs.cifs_utils ];
system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs_utils ];

boot.initrd.availableKernelModules = mkIf inInitrd
[ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ];
Expand Down

0 comments on commit 2b6d011

Please sign in to comment.