uriboot test

3 files changed, 28 insertions, 14 deletions

diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index c1eaa65..6b35050 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -483,6 +483,19 @@ 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();
 
 		if(is_dir("../resources/bootos/$bootosID/kernel/") && is_numeric($bootosID)){
diff --git a/application/modules/ipxe/controllers/ResourceController.php b/application/modules/ipxe/controllers/ResourceController.php
index 4d2a92a..839debc 100644
--- a/application/modules/ipxe/controllers/ResourceController.php
+++ b/application/modules/ipxe/controllers/ResourceController.php
@@ -33,7 +33,20 @@ class Ipxe_ResourceController extends Zend_Controller_Action
 			$this->thisSession = $session->setOptions($result[0]);
 			$this->thisSession->setID($result[0]['sessionID']);
 		}
+		
+		$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);
+		}	
 	}
 	
 	public function getvesamenuAction(){
@@ -99,18 +112,6 @@ class Ipxe_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/views/scripts/resource/getvesamenu.phtml b/application/modules/ipxe/views/scripts/resource/getvesamenu.phtml
index a93d3d8..b470c85 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/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/file/initramfs alpha=$this->alphaID file=http://$this->host/c/$this->alphaID/default.tgz ".$bme->getKclappend());
 		}
 	}    
 }