* aufs2 -> aufs.

svn path=/nixos/trunk/; revision=30323
This commit is contained in:
Eelco Dolstra
2011-11-08 15:12:11 +00:00
parent 848485a043
commit 3e30d87c26
4 changed files with 7 additions and 12 deletions

View File

@@ -71,7 +71,7 @@ with pkgs.lib;
boot.initrd.kernelModules = [ "xen-blkfront" "aufs" ];
boot.kernelModules = [ "xen-netfront" ];
boot.extraModulePackages = [ config.boot.kernelPackages.aufs2 ];
boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
# Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd.
boot.loader.grub.device = "nodev";

View File

@@ -78,7 +78,7 @@ with pkgs.lib;
boot.initrd.kernelModules = [ "aufs" ];
boot.extraModulePackages = [ config.boot.kernelPackages.aufs2 ];
boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/vda";

View File

@@ -244,7 +244,7 @@ in
++ optional cfg.writableStore [ "aufs" ];
boot.extraModulePackages =
optional cfg.writableStore config.boot.kernelPackages.aufs2;
optional cfg.writableStore config.boot.kernelPackages.aufs;
boot.initrd.extraUtilsCommands =
''