From c384ea26e4b5a62fe7d29d27cf871edff9df7e03 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 2 Feb 2013 00:54:05 -0500
Subject: [PATCH] Update iso_efi to use gummiboot

---
 .../installer/cd-dvd/installation-cd-efi.nix  |  2 +-
 modules/installer/cd-dvd/iso-image.nix        | 27 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-efi.nix b/modules/installer/cd-dvd/installation-cd-efi.nix
index bc3e5908916..56308397bf6 100644
--- a/modules/installer/cd-dvd/installation-cd-efi.nix
+++ b/modules/installer/cd-dvd/installation-cd-efi.nix
@@ -3,7 +3,7 @@
 {
   require = [ ./installation-cd-minimal.nix ];
 
-  boot.kernelPackages = pkgs.linuxPackages_3_3;
+  boot.kernelPackages = pkgs.linuxPackages_3_7;
   boot.vesa = false;
 
   # What follows should probably move into base once the base kernel has the
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 27e731d61e8..3d8c7f6190b 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -119,17 +119,6 @@ let
     '';
 
 
-  efiShell = if pkgs.stdenv.isi686 then
-    pkgs.fetchurl {
-      url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi";
-      sha256 = "1gv6kyaspczdp7x8qnx5x76ilriaygkfs99ay7ihhdi6riclkhfl";
-    }
-  else
-    pkgs.fetchurl {
-      url = "https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi";
-      sha256 = "1g18z84rlavxr5gsrh2g942rfr6znv9fs3fqww5m7dhmnysgyv8p";
-    };
-
   # The efi boot image
   efiImg = pkgs.runCommand "efi-image_eltorito" {}
     ''
@@ -139,14 +128,22 @@ let
       ${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" \
-        ${efiShell} ::efi/boot/boot${targetArch}.efi
+        ${pkgs.gummiboot}/bin/gummiboot.efi ::efi/boot/boot${targetArch}.efi
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
-        ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage.efi
+        ${config.boot.kernelPackages.kernel + "/bzImage"} ::bzImage
       ${pkgs.mtools}/bin/mcopy -v -i "$out" \
         ${config.system.build.initialRamdisk + "/initrd"} ::efi/nixos/initrd
-      echo "bzImage.efi initrd=\\efi\\nixos\\initrd init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" > boot-params
-      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::startup.nsh
+      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
+      echo "default nixos-livecd" > boot-params
+      echo "timeout 5" >> boot-params
+      ${pkgs.mtools}/bin/mcopy -v -i "$out" boot-params ::loader/loader.conf
     '';
 
   targetArch = if pkgs.stdenv.isi686 then