diff options
| author | michael pereira | 2011-07-11 15:28:59 +0200 |
|---|---|---|
| committer | michael pereira | 2011-07-11 15:28:59 +0200 |
| commit | 50a386fcbbcd55fe484212379c097fe959e55ce7 (patch) | |
| tree | aca9584b59ce6c34c859b9623f3c66ae745f2f49 /application | |
| parent | uriload test (diff) | |
| download | pbs2-50a386fcbbcd55fe484212379c097fe959e55ce7.tar.gz pbs2-50a386fcbbcd55fe484212379c097fe959e55ce7.tar.xz pbs2-50a386fcbbcd55fe484212379c097fe959e55ce7.zip | |
init fix
Diffstat (limited to 'application')
3 files changed, 14 insertions, 27 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 6b35050..fcae33c 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -482,19 +482,6 @@ class ResourceController extends Zend_Controller_Action public function getkernelAction() { - -// $bootmenuntryID = $this->_request->getParam('bme'); -// -// $bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper(); -// $bootmenuentry = new Application_Model_BootMenuEntries(); -// $bootmenuentriesMapper->find($bootmenuntryID,$bootmenuentry); -// -// $sessionMapper = new Application_Model_SessionMapper(); -// -// $this->thisSession->setBootmenuentryID($bootmenuntryID); -// $this->thisSession->setBootosID($bootmenuentry->getBootosID()); -// $sessionMapper->save($this->thisSession); - $bootosID = $this->thisSession->getBootosID(); diff --git a/application/modules/ipxe/controllers/ResourceController.php b/application/modules/ipxe/controllers/ResourceController.php index c961f05..839debc 100644 --- a/application/modules/ipxe/controllers/ResourceController.php +++ b/application/modules/ipxe/controllers/ResourceController.php @@ -34,19 +34,19 @@ class Ipxe_ResourceController extends Zend_Controller_Action $this->thisSession->setID($result[0]['sessionID']); } -// $bootmenuntryID = $this->_request->getParam('bme'); + $bootmenuntryID = $this->_request->getParam('bme'); -// if(isset($bootmenuntryID)){ -// $bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper(); -// $bootmenuentry = new Application_Model_BootMenuEntries(); -// $bootmenuentriesMapper->find($bootmenuntryID,$bootmenuentry); -// -// $sessionMapper = new Application_Model_SessionMapper(); -// -// $this->thisSession->setBootmenuentryID($bootmenuntryID); -// $this->thisSession->setBootosID($bootmenuentry->getBootosID()); -// $sessionMapper->save($this->thisSession); -// } + if(isset($bootmenuntryID)){ + $bootmenuentriesMapper = new Application_Model_BootMenuEntriesMapper(); + $bootmenuentry = new Application_Model_BootMenuEntries(); + $bootmenuentriesMapper->find($bootmenuntryID,$bootmenuentry); + + $sessionMapper = new Application_Model_SessionMapper(); + + $this->thisSession->setBootmenuentryID($bootmenuntryID); + $this->thisSession->setBootosID($bootmenuentry->getBootosID()); + $sessionMapper->save($this->thisSession); + } } public function getvesamenuAction(){ diff --git a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml index b470c85..b963a1c 100644 --- a/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml +++ b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml @@ -129,10 +129,10 @@ if(isset($this->bmelist)){ if($bme->getKcl() && $kcl != null){ uriboot ( $bme->getTitle(), - "http://$this->host/ipxe/resource/getkernel/alpha/$this->alphaID/bme/".$bme->getID()."/file/kernel", "initrd=http://$this->host/ipxe/resource/getinitramfs/alpha/$this->alphaID/file/initramfs $kcl alpha=$this->alphaID file=http://$this->host/c/$this->alphaID/default.tgz ".$bme->getKclappend()); + "http://$this->host/ipxe/resource/getkernel/alpha/$this->alphaID/bme/".$bme->getID()."/file/kernel", "initrd=http://$this->host/ipxe/resource/getinitramfs/alpha/$this->alphaID/bme/".$bme->getID()."/file/initramfs $kcl alpha=$this->alphaID file=http://$this->host/c/$this->alphaID/default.tgz ".$bme->getKclappend()); }else{ uriboot ( $bme->getTitle(), - "http://$this->host/ipxe/resource/getkernel/alpha/$this->alphaID/bme/".$bme->getID()."/file/kernel", "initrd=http://$this->host/ipxe/resource/getinitramfs/alpha/$this->alphaID/file/initramfs alpha=$this->alphaID file=http://$this->host/c/$this->alphaID/default.tgz ".$bme->getKclappend()); + "http://$this->host/ipxe/resource/getkernel/alpha/$this->alphaID/bme/".$bme->getID()."/file/kernel", "initrd=http://$this->host/ipxe/resource/getinitramfs/alpha/$this->alphaID/bme/".$bme->getID()."/file/initramfs alpha=$this->alphaID file=http://$this->host/c/$this->alphaID/default.tgz ".$bme->getKclappend()); } } } |