From f26920697227a69f333b0c19e6fe49f1b115904d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 31 Mar 2011 23:03:54 +0000
Subject: [PATCH] Update iso-image.nix to work with kernels that use AUFS 2.1
 instead of AUFS 2. Older kernels are unaffected.

svn path=/nixos/trunk/; revision=26646
---
 modules/installer/cd-dvd/iso-image.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index e17dce4f71c..3001eac3560 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -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" ];