Author: shlevy
Date: Wed Sep 28 22:43:53 2011
New Revision: 29538
URL: https://ssl.nixos.org/websvn/nix/?rev=29538&sc=1
Log:
Enable building ISOs for aufs3 kernels
Modified:
nixos/trunk/modules/installer/cd-dvd/iso-image.nix
Modified: nixos/trunk/modules/installer/cd-dvd/iso-image.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/iso-image.nix Wed Sep 28 22:34:46
2011 (r29537)
+++ nixos/trunk/modules/installer/cd-dvd/iso-image.nix Wed Sep 28 22:43:53
2011 (r29538)
@@ -154,12 +154,15 @@
# 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" ];
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
