Fold efi booting into the default livecd

Signed-off-by: Shea Levy <shea@shealevy.com>

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" ];
 }

nixos/modules/installer/cd-dvd/installation-cd-efi.nix

@@ -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;
-}

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:

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";