From 13b176a02aeda960ac4c0aa4bf5b16ff5f5b5634 Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Fri, 4 Sep 2015 23:17:35 -0500
Subject: [PATCH] Adding debug console to ipxe disks

---
 ipxe/netboot.xyz-dhcp   | 9 ++++++++-
 ipxe/netboot.xyz-static | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ipxe/netboot.xyz-dhcp b/ipxe/netboot.xyz-dhcp
index 0f3c4164..2cd0b120 100644
--- a/ipxe/netboot.xyz-dhcp
+++ b/ipxe/netboot.xyz-dhcp
@@ -3,9 +3,11 @@
 :start
 set version 1
 echo netboot.xyz iPXE loader v${version}
+goto dhcp
 
 :dhcp  
 dhcp || goto static
+prompt --key m --timeout 4000 Hit the ${bold}d${boldoff} key to open the debug console && goto debug || goto start
 goto start
 
 :static
@@ -21,7 +23,7 @@ echo Attempting chainload of netboot.xyz...
 goto start || goto failsafe
 
 :start
-chain http://cdn.netboot.xyz/menu.ipxe
+chain --autofree http://cdn.netboot.xyz/menu.ipxe
 goto boot
 
 :failsafe
@@ -30,3 +32,8 @@ goto start
 
 :boot
 sanboot --no-describe --drive 0x80
+
+:debug
+echo Type "exit" to return to menu
+shell
+goto start
diff --git a/ipxe/netboot.xyz-static b/ipxe/netboot.xyz-static
index 94a42a55..0e04e4ed 100644
--- a/ipxe/netboot.xyz-static
+++ b/ipxe/netboot.xyz-static
@@ -3,6 +3,8 @@
 :start
 set version 1
 echo netboot.xyz iPXE loader v${version}
+prompt --key m --timeout 4000 Hit the ${bold}d${boldoff} key to open the debug console && goto debug || goto start
+goto static
 
 :static
 echo Please enter in the networking information of your Cloud Server:
@@ -17,7 +19,7 @@ echo Attempting chainload of netboot.xyz...
 goto start || goto failsafe
 
 :start
-chain http://cdn.netboot.xyz/menu.ipxe
+chain --autofree http://cdn.netboot.xyz/menu.ipxe
 goto boot
 
 :failsafe
@@ -26,3 +28,8 @@ goto start
 
 :boot
 sanboot --no-describe --drive 0x80
+
+:debug
+echo Type "exit" to return to menu
+shell
+goto start