diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-08 15:12:11 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-08 15:12:11 +0000 |
| commit | 3e30d87c265bfdb9558905e014225e2ebd56909e (patch) | |
| tree | 5c50ce47d17b2fc9699250b6bff574b5b08314b8 /modules/installer/cd-dvd/iso-image.nix | |
| parent | 848485a043938048089e5514583583c18352dde1 (diff) | |
| download | nixpkgs-3e30d87c265bfdb9558905e014225e2ebd56909e.tar nixpkgs-3e30d87c265bfdb9558905e014225e2ebd56909e.tar.gz nixpkgs-3e30d87c265bfdb9558905e014225e2ebd56909e.tar.bz2 nixpkgs-3e30d87c265bfdb9558905e014225e2ebd56909e.tar.lz nixpkgs-3e30d87c265bfdb9558905e014225e2ebd56909e.tar.xz nixpkgs-3e30d87c265bfdb9558905e014225e2ebd56909e.tar.zst nixpkgs-3e30d87c265bfdb9558905e014225e2ebd56909e.zip | |
* aufs2 -> aufs.
svn path=/nixos/trunk/; revision=30323
Diffstat (limited to 'modules/installer/cd-dvd/iso-image.nix')
| -rw-r--r-- | modules/installer/cd-dvd/iso-image.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix index daeebde76cf..0a2f76c919c 100644 --- a/modules/installer/cd-dvd/iso-image.nix +++ b/modules/installer/cd-dvd/iso-image.nix @@ -154,15 +154,10 @@ in # We need squashfs in the initrd to mount the compressed Nix store, # and aufs to make the root filesystem appear writable. boot.extraModulePackages = - let features = config.boot.kernelPackages.kernel.features; in - - pkgs.stdenv.lib.singleton (if features ? aufs2 && features.aufs2 then - config.boot.kernelPackages.aufs2 - 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"); + if config.boot.kernelPackages.aufs == null then + abort "This kernel doesn't have aufs enabled" + else + [ config.boot.kernelPackages.aufs ]; boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ]; |