summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authormichael pereira2011-09-01 16:40:40 +0200
committermichael pereira2011-09-01 16:40:40 +0200
commitc76dfd90323aec169aaae7c272b4a03fe38946c2 (patch)
tree4aa0bc2dcd426506d6c0b3bfe22f6959039baad9 /application
parentvesamenu test (diff)
downloadpbs2-c76dfd90323aec169aaae7c272b4a03fe38946c2.tar.gz
pbs2-c76dfd90323aec169aaae7c272b4a03fe38946c2.tar.xz
pbs2-c76dfd90323aec169aaae7c272b4a03fe38946c2.zip
loop fetch_pxelinux
Diffstat (limited to 'application')
-rw-r--r--application/modules/ipxe/controllers/AuthController.php12
-rw-r--r--application/modules/ipxe/views/scripts/resource/getvesamenu.phtml2
2 files changed, 7 insertions, 7 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index 7cfa649..2b1f7ba 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -72,12 +72,12 @@ class Ipxe_AuthController extends Zend_Controller_Action
$result .= "imgfree\n";
if($login){
$result .= "login\n";
- $result .= "kernel http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenu/alpha/".$session->getAlphasessionID()." http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/true\n";
+ //$result .= "kernel http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenu/alpha/".$session->getAlphasessionID()." http://\${username:uristring}:\${password:uristring}@".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/true\n";
}else{
- $result .= "kernel http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenu/alpha/".$session->getAlphasessionID()." http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n";
-// $result .= "set 209:string http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n";
-// $result .= "set 210:string http://pbs2.mp.openslx.org/media/\n";
-// $result .= "chain \${210:string}pxelinux.0\n";
+ //$result .= "kernel http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenu/alpha/".$session->getAlphasessionID()." http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n";
+ $result .= "set 209:string http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$session->getAlphasessionID()."/login/false\n";
+ $result .= "set 210:string http://pbs2.mp.openslx.org/media/\n";
+ $result .= ":retry_pxe\n chain \${210:string}pxelinux.0 || goto retry_pxe\n";
}
//$result .= "module http://pbs2.mp.openslx.org/media/img/pbs2.png";
@@ -85,7 +85,7 @@ class Ipxe_AuthController extends Zend_Controller_Action
header("Content-Length: ".(strlen($result)));
- echo $result;
+ echo $result;
}
else{
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 9fb72f8..06546aa 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -58,7 +58,7 @@
?>
TIMEOUT 100
PROMPT 0
-#DEFAULT vesamenu.c32
+DEFAULT http://pbs2.mp.openslx.org/media/vesamenu.c32
MENU BACKGROUND http://pbs2.mp.openslx.org/media/img/pbs2.png
MENU WIDTH 78