summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
authormichael pereira2011-10-31 00:47:30 +0100
committermichael pereira2011-10-31 00:47:30 +0100
commit9b238ed3f0eb9e22be51a7c4d0f4acda6ce97b9a (patch)
treeec09faa8e7187d77ef43da5ddaab31251b939186 /application/modules
parentlogin (diff)
downloadpbs2-9b238ed3f0eb9e22be51a7c4d0f4acda6ce97b9a.tar.gz
pbs2-9b238ed3f0eb9e22be51a7c4d0f4acda6ce97b9a.tar.xz
pbs2-9b238ed3f0eb9e22be51a7c4d0f4acda6ce97b9a.zip
login
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/ipxe/controllers/AuthController.php4
-rw-r--r--application/modules/ipxe/views/scripts/resource/getvesamenu.phtml7
2 files changed, 9 insertions, 2 deletions
diff --git a/application/modules/ipxe/controllers/AuthController.php b/application/modules/ipxe/controllers/AuthController.php
index 44fafbf..ecd43da 100644
--- a/application/modules/ipxe/controllers/AuthController.php
+++ b/application/modules/ipxe/controllers/AuthController.php
@@ -84,7 +84,9 @@ class Ipxe_AuthController extends Zend_Controller_Action
if(isset($this->session)){
$result .= "set filename http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/alpha/".$this->session->getAlphasessionID()."/error/$this->error\n";
$result .= ":start\n";
- $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 \${filename}\n";
+ $result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 \${filename}\n";
+ $result .= "show filename\n";
+ $result .= "prompt\n";
$result .= "goto start\n";
}else{
$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/serialnumber/$serialnumber/mac/$mac/error/$this->error\n";
diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index 54922ef..b4b7009 100644
--- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
+++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
@@ -36,6 +36,10 @@
order.");
}
+ function separator(){
+ echo "MENU SEPARATOR\n";
+ }
+
function texthelp ( $texthelp ){
echo "TEXT HELP\n";
echo $texthelp."\n";
@@ -107,6 +111,7 @@ menu color disabled 1;37;40 #ffffffff #ffcacac8 std
#menu color timeout 1;37;40 #ffff8b00 #ff8093a1 std
#menu color help 37;40 #ff1c2a33 #00000000 none
MENU MSGCOLOR #ff1c2a33 #00000000 none
+MENU SEPARATOR #ffffffff #ffffffff none
<?php
@@ -157,7 +162,7 @@ MENU MSGCOLOR #ff1c2a33 #00000000 none
nobootmenu();
}
- comment ("", "");
+ separator();
comment ("info", "More Options:");
if(!$this->loggedin){