suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

nixos/nfs: Fix configuration merge

Browse Source
This commit is contained in:
Rickard Nilsson 2014-09-16 10:51:05 +02:00
parent 8dd1abe3fa
commit 66bbbc205d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/tasks/filesystems/nfs.nix
View File

@ -54,12 +54,16 @@ in
###### implementation ###### implementation
config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) ({ config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) {
services.rpcbind.enable = true; services.rpcbind.enable = true;
system.fsPackages = [ pkgs.nfsUtils ]; system.fsPackages = [ pkgs.nfsUtils ];
boot.extraModprobeConfig = mkIf (cfg.lockdPort != null) ''
options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort}
'';
boot.kernelModules = [ "sunrpc" ]; boot.kernelModules = [ "sunrpc" ];
boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ]; boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
@ -117,9 +121,5 @@ in
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
}; };
} // mkIf (cfg.lockdPort != null) { };
boot.extraModprobeConfig = ''
options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort}
'';
});
} }