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

Enable building ISOs for aufs3 kernels 

svn path=/nixos/trunk/; revision=29538
This commit is contained in:
Shea Levy 2011-09-28 22:43:53 +00:00
parent 32d6a441a5
commit 3a201ef6a7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/installer/cd-dvd/iso-image.nix
View File

@ -154,12 +154,15 @@ in
# We need squashfs in the initrd to mount the compressed Nix store,
# and aufs to make the root filesystem appear writable.
boot.extraModulePackages =
optional
(! ( config.boot.kernelPackages.kernel.features ? aufs || config.boot.kernelPackages.kernel.features ? aufs2_1 ) )
let features = config.boot.kernelPackages.kernel.features; in
pkgs.stdenv.lib.singleton (if features ? aufs2 && features.aufs2 then
config.boot.kernelPackages.aufs2
++ optional
( config.boot.kernelPackages.kernel.features ? aufs2_1 )
config.boot.kernelPackages.aufs2_1;
else if features ? aufs2_1 && features.aufs2_1 then
config.boot.kernelPackages.aufs2_1
else if features ? aufs3 && features.aufs3 then
config.boot.kernelPackages.aufs3
else abort "This kernel doesn't have aufs enabled");
boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];