From a315eefca145ee5aace6b3ee9a5bf381c5f535d4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 16 Mar 2012 11:22:05 +0000
Subject: [PATCH] Restore old installation-cd-new-kernel.nix and create a new
 installation-cd-efi.nix

svn path=/nixos/trunk/; revision=33146
---
 .../installer/cd-dvd/installation-cd-efi.nix  | 22 +++++++++++++++++++
 .../cd-dvd/installation-cd-new-kernel.nix     | 16 +-------------
 2 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 modules/installer/cd-dvd/installation-cd-efi.nix

diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
new file mode 100644
index 00000000000..1d7af6401ef
--- /dev/null
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+  require = [ ./installation-cd-graphical.nix ];
+
+  boot.kernelPackages = pkgs.linuxPackages_3_3;
+  boot.vesa = false;
+
+  # What follows should probably move into base once the base kernel has the
+  # efi boot stub
+
+  # Get a console as soon as the initrd loads fbcon on EFI boot
+  boot.initrd.kernelModules = [ "fbcon" ];
+
+  # Enable reading EFI variables via sysfs
+  boot.kernelModules = [ "efivars" ];
+
+  # efi-related tools
+  environment.systemPackages = [ pkgs.efibootmgr ];
+
+  isoImage.makeEfiBootable = true;
+}
diff --git a/modules/installer/cd-dvd/installation-cd-new-kernel.nix b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
index 1d7af6401ef..c7ea5ddfb01 100644
--- a/modules/installer/cd-dvd/installation-cd-new-kernel.nix
+++ b/modules/installer/cd-dvd/installation-cd-new-kernel.nix
@@ -3,20 +3,6 @@
 {
   require = [ ./installation-cd-graphical.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_3;
+  boot.kernelPackages = pkgs.linuxPackages_3_2;
   boot.vesa = false;
-
-  # What follows should probably move into base once the base kernel has the
-  # efi boot stub
-
-  # Get a console as soon as the initrd loads fbcon on EFI boot
-  boot.initrd.kernelModules = [ "fbcon" ];
-
-  # Enable reading EFI variables via sysfs
-  boot.kernelModules = [ "efivars" ];
-
-  # efi-related tools
-  environment.systemPackages = [ pkgs.efibootmgr ];
-
-  isoImage.makeEfiBootable = true;
 }