Author: shlevy
Date: Thu Mar 31 23:03:54 2011
New Revision: 26646
URL: https://svn.nixos.org/websvn/nix/?rev=26646&sc=1
Log:
Update iso-image.nix to work with kernels that use AUFS 2.1 instead of AUFS 2.
Older kernels are unaffected.
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 Thu Mar 31 22:20:11
2011 (r26645)
+++ nixos/trunk/modules/installer/cd-dvd/iso-image.nix Thu Mar 31 23:03:54
2011 (r26646)
@@ -148,8 +148,10 @@
# 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" ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
