From 7f5e4f5eb80f31cc7e1885002e271b0c08fad915 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 9 Oct 2013 11:44:50 -0400
Subject: [PATCH] Update efi install cd

Signed-off-by: Shea Levy <shea@shealevy.com>
---
 .../installer/cd-dvd/installation-cd-efi.nix  | 15 +++-------
 modules/installer/cd-dvd/iso-image.nix        | 28 +++++++++----------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
index 4c15fc7658..4aa788feea 100644
--- a/modules/installer/cd-dvd/installation-cd-efi.nix
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -1,21 +1,14 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./installation-cd-minimal.nix ];
+  # Move into base image once using 3.10 or later
 
-  boot.kernelPackages = pkgs.linuxPackages_3_9;
-  boot.vesa = false;
+  require = [ ./installation-cd-minimal.nix ];
 
-  # What follows should probably move into base once the base kernel has the
-  # efi boot stub
+  boot.kernelPackages = pkgs.linuxPackages_3_10;
 
   # Get a console as soon as the initrd loads fbcon on EFI boot
-  # Enable reading EFI variables via sysfs
-  # !!! Needing efivars will only be necessary until http://article.gmane.org/gmane.linux.kernel.efi/773 is merged
-  boot.initrd.kernelModules = [ "fbcon" "efivars" ];
-
-  # efi-related tools
-  environment.systemPackages = [ pkgs.efibootmgr ];
+  boot.initrd.kernelModules = [ "fbcon" ];
 
   isoImage.makeEfiBootable = true;
 }
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 9e4352e48b..de9728d677 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -44,31 +44,31 @@ let
 
 
   # The efi boot image
-  efiImg = pkgs.runCommand "efi-image_eltorito" {}
+  efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools ]; }
     ''
       #Let's hope 10M is enough
       dd bs=2048 count=5120 if=/dev/zero of="$out"
       ${pkgs.dosfstools}/sbin/mkfs.vfat "$out"
-      ${pkgs.mtools}/bin/mmd -i "$out" efi
-      ${pkgs.mtools}/bin/mmd -i "$out" efi/boot
-      ${pkgs.mtools}/bin/mmd -i "$out" efi/nixos
-      ${pkgs.mtools}/bin/mmd -i "$out" loader
-      ${pkgs.mtools}/bin/mmd -i "$out" loader/entries
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
+      mmd -i "$out" efi
+      mmd -i "$out" efi/boot
+      mmd -i "$out" efi/nixos
+      mmd -i "$out" loader
+      mmd -i "$out" loader/entries
+      mcopy -v -i "$out" \
         ${pkgs.gummiboot}/lib/gummiboot/gummiboot${targetArch}.efi \
         ::efi/boot/boot${targetArch}.efi
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.system.build.initialRamdisk + "/initrd"} ::efi/nixos/initrd
+      mcopy -v -i "$out" \
+        ${config.boot.kernelPackages.kernel}/bzImage ::bzImage
+      mcopy -v -i "$out" \
+        ${config.system.build.initialRamdisk}/initrd ::efi/nixos/initrd
       echo "title NixOS LiveCD" > boot-params
       echo "linux /bzImage" >> boot-params
       echo "initrd /efi/nixos/initrd" >> boot-params
       echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/entries/nixos-livecd.conf
+      mcopy -v -i "$out" boot-params ::loader/entries/nixos-livecd.conf
       echo "default nixos-livecd" > boot-params
       echo "timeout 5" >> boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/loader.conf
+      mcopy -v -i "$out" boot-params ::loader/loader.conf
     '';
 
   targetArch = if pkgs.stdenv.isi686 then
@@ -194,8 +194,6 @@ in
 
     boot.initrd.kernelModules = [ "loop" ];
 
-    boot.kernelModules = optional config.isoImage.makeEfiBootable "efivars";
-
     # In stage 1, mount a tmpfs on top of / (the ISO image) and
     # /nix/store (the squashfs image) to make this a live CD.
     boot.initrd.postMountCommands =