From 3e30d87c265bfdb9558905e014225e2ebd56909e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Nov 2011 15:12:11 +0000 Subject: [PATCH] * aufs2 -> aufs. svn path=/nixos/trunk/; revision=30323 --- modules/installer/cd-dvd/iso-image.nix | 13 ++++--------- modules/virtualisation/amazon-image.nix | 2 +- modules/virtualisation/nova-image.nix | 2 +- modules/virtualisation/qemu-vm.nix | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix index daeebde76cf5..0a2f76c919c1 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" ]; diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix index 7608f4574657..c1c31358d8c1 100644 --- a/modules/virtualisation/amazon-image.nix +++ b/modules/virtualisation/amazon-image.nix @@ -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"; diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix index 87489c39d35a..ea4dbcc4dd4c 100644 --- a/modules/virtualisation/nova-image.nix +++ b/modules/virtualisation/nova-image.nix @@ -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"; diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix index 7738ce1f2e76..9f6801e89cce 100644 --- a/modules/virtualisation/qemu-vm.nix +++ b/modules/virtualisation/qemu-vm.nix @@ -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 = ''