diff options
Diffstat (limited to 'application/modules')
| -rw-r--r-- | application/modules/ipxe/controllers/AuthController.php | 7 | ||||
| -rw-r--r-- | application/modules/ipxe/views/scripts/resource/getvesamenu.phtml | 13 |
2 files changed, 8 insertions, 12 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php index ab0f48f..1a1e760 100644 --- a/application/modules/ipxe/controllers/AuthController.php +++ b/application/modules/ipxe/controllers/AuthController.php @@ -72,13 +72,10 @@ class Ipxe_AuthController extends Zend_Controller_Action $result .= "imgfree\n"; if($login){ $result .= "login\n"; - $result .= "set 209:string http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/true\n"; + $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/true\n"; }else{ - $result .= "set 209:string http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n"; + $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n"; } - - $result .= "set 210:string http://".$_SERVER['HTTP_HOST']."/ipxe/\n"; - $result .= "chain \${210:string}pxelinux.0\n"; header("Content-Length: ".(strlen($result))); 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."); } |