From cd9786eed27f3ef5535605c483829fdf914c80a1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 1 Nov 2013 11:29:36 -0400
Subject: [PATCH] Fold efi booting into the default livecd

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../installer/cd-dvd/installation-cd-base.nix      |  6 ++++++
 .../installer/cd-dvd/installation-cd-efi.nix       | 14 --------------
 nixos/release.nix                                  |  9 ---------
 nixos/tests/efi-installer.nix                      |  2 +-
 4 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 nixos/modules/installer/cd-dvd/installation-cd-efi.nix

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 999871ab074f..1aba67dcd9e9 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -32,6 +32,12 @@ with pkgs.lib;
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.busybox ];
 
+  # EFI booting
+  isoImage.makeEfiBootable = true;
+
   # Add Memtest86+ to the CD.
   boot.loader.grub.memtest86 = true;
+
+  # Get a console as soon as the initrd loads fbcon on EFI boot
+  boot.initrd.kernelModules = [ "fbcon" ];
 }
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-efi.nix b/nixos/modules/installer/cd-dvd/installation-cd-efi.nix
deleted file mode 100644
index 4aa788feeae5..000000000000
--- a/nixos/modules/installer/cd-dvd/installation-cd-efi.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Move into base image once using 3.10 or later
-
-  require = [ ./installation-cd-minimal.nix ];
-
-  boot.kernelPackages = pkgs.linuxPackages_3_10;
-
-  # Get a console as soon as the initrd loads fbcon on EFI boot
-  boot.initrd.kernelModules = [ "fbcon" ];
-
-  isoImage.makeEfiBootable = true;
-}
diff --git a/nixos/release.nix b/nixos/release.nix
index 1ffb334d90a4..120b1289bd06 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -143,15 +143,6 @@ in rec {
     inherit system;
   });
 
-  # A variant with efi booting support. Once cd-minimal has a newer kernel,
-  # this should be enabled by default.
-  iso_efi = forAllSystems (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-efi.nix;
-    type = "efi";
-    maintainers = [ "shlevy" ];
-    inherit system;
-  });
-
 
   # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
   ova = forAllSystems (system:
diff --git a/nixos/tests/efi-installer.nix b/nixos/tests/efi-installer.nix
index 8a05dbf2a610..63aa0289ffbe 100644
--- a/nixos/tests/efi-installer.nix
+++ b/nixos/tests/efi-installer.nix
@@ -12,7 +12,7 @@ let
     (import ../lib/eval-config.nix {
       inherit system;
       modules =
-        [ ../modules/installer/cd-dvd/installation-cd-efi.nix
+        [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
           ../modules/testing/test-instrumentation.nix
           { key = "serial";