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

Update iso-image.nix to work with kernels that use AUFS 2.1 instead of AUFS 2. Older kernels are unaffected.

Browse Source 
svn path=/nixos/trunk/; revision=26646
This commit is contained in:
Shea Levy 2011-03-31 23:03:54 +00:00
parent 1e2c0d6284
commit f269206972
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,8 +148,10 @@ in
# and aufs to make the root filesystem appear writable.
boot.extraModulePackages =
optional
(! config.boot.kernelPackages.kernel.features ? aufs)
config.boot.kernelPackages.aufs2;
(! ( config.boot.kernelPackages.kernel.features ? aufs || config.boot.kernelPackages.kernel.features ? aufs2_1 ) )
config.boot.kernelPackages.aufs2
++ optional( config.boot.kernelPackages.kernel.features ? aufs2_1 )
config.boot.kernelPackages.aufs2_1;
boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];