public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #119 from jcumming/zfs.130311

Browse Source 
need a newline in extraModprobeConfig
This commit is contained in:
Peter Simons 2013-03-11 09:30:52 -07:00
commit 7abc36c145
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/tasks/filesystems/zfs.nix
View File

@ -43,7 +43,9 @@ in
boot = { boot = {
kernelModules = [ "spl" "zfs" ] ; kernelModules = [ "spl" "zfs" ] ;
extraModulePackages = [ kernel.zfs kernel.spl ]; extraModulePackages = [ kernel.zfs kernel.spl ];
extraModprobeConfig = mkIf (cfgSpl.hostid != "") "options spl spl_hostid=${cfgSpl.hostid}"; extraModprobeConfig = mkIf (cfgSpl.hostid != "") ''
options spl spl_hostid=${cfgSpl.hostid}
'';
}; };
boot.initrd = mkIf inInitrd { boot.initrd = mkIf inInitrd {