From 2ed3147ea59fa8fb015d5d3ad30914249d6f5fe8 Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Wed, 21 Sep 2011 17:46:28 +0200
Subject: gpxecmd.c32

---
 .../modules/ipxe/views/scripts/resource/getvesamenu.phtml   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'application/modules/ipxe/views/scripts')

diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 5b1c5dd..ff978b1 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -18,9 +18,9 @@
   
   function uriboot ( $label, $uri, $args ) {
     label ( $label );
-    echo "  COM32 ".$uri."\n";
+    echo "  kernel ".$uri."\n";
     if ( $args )
-        echo "  APPEND ".$args."\n";
+        echo "  append ".$args."\n";
   }
   
   function localboot () {
@@ -40,8 +40,8 @@
     echo "label failed\n";
     echo "  menu label Authentication Failed\n";
     echo "  menu disable\n";
-    uriboot ( "Try again", "http://$this->host/ipxe/gpxecmd.c32", "chain http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/true" );
-    uriboot ( "Return to Group Bootmenu", "http://$this->host/ipxe/gpxecmd.c32", "chain http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false" );
+    uriboot ( "Try again", "http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/true", "" );
+    uriboot ( "Return to Group Bootmenu", "http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false", "" );
   }
   
   function authenticated ($username, $password) {
@@ -58,7 +58,6 @@
   ?>
 TIMEOUT 100
 PROMPT 0
-DEFAULT <?php echo "http://$this->host/ipxe/vesamenu.c32\n"; ?>
 
 MENU BACKGROUND <?php echo "http://$this->host/ipxe/pbs2.png\n"; ?>
 MENU WIDTH 78
@@ -122,11 +121,11 @@ MENU MSGCOLOR                            #ff1c2a33 #00000000 none
   			}
   		}
   		if($this->login)
-  			uriboot ( "Return to Group Bootmenu", "http://$this->host/ipxe/gpxecmd.c32", "chain http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false" );
+  			uriboot ( "Return to Group Bootmenu", "http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false", "" );
   	}
 
   	if(!$this->login){
-  		uriboot ( "Login", "http://$this->host/ipxe/gpxecmd.c32", "chain http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/false" );
+  		uriboot ( "Login", "http://$this->host/ipxe/auth/serial/serialnumber/55-44-33-22-11/mac/123/login/true", "" );
   		texthelp("Login to get your own Bootmenu.");
   	}
   	
-- 
cgit v1.2.3-55-g7522