summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Neves2012-06-28 15:50:34 +0200
committerMichael Neves2012-06-28 15:50:34 +0200
commit6e223fef67355e3157cd0419a8bd9249b9f5a4f4 (patch)
treede90762dc43e971ddae4681a023eea37224b75dd
parentipxe fehlermeldung (diff)
downloadpbs2-6e223fef67355e3157cd0419a8bd9249b9f5a4f4.tar.gz
pbs2-6e223fef67355e3157cd0419a8bd9249b9f5a4f4.tar.xz
pbs2-6e223fef67355e3157cd0419a8bd9249b9f5a4f4.zip
ipxe fehlermeldung
-rw-r--r--application/modules/ipxe/controllers/ResourceController.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/application/modules/ipxe/controllers/ResourceController.php b/application/modules/ipxe/controllers/ResourceController.php
index cc51f31..b5aae93 100644
--- a/application/modules/ipxe/controllers/ResourceController.php
+++ b/application/modules/ipxe/controllers/ResourceController.php
@@ -291,16 +291,16 @@ class Ipxe_ResourceController extends Zend_Controller_Action {
$result .= "imgtrust --permanent\n";
$result .= "kernel --name kernel $this->httpmode://$this->host/ipxe/resource/getkernel/alpha/".$this->session->getAlphasessionID()."\n";
- $result .= "imgverify kernel $this->httpmode://$this->host/ipxe/resource/getsignature/file/kernel/alpha/".$this->session->getAlphasessionID()." || exit\n";
+ $result .= "imgverify kernel $this->httpmode://$this->host/ipxe/resource/getsignature/file/kernel/alpha/".$this->session->getAlphasessionID()."\n";
$result .= "initrd --name initramfs $this->httpmode://$this->host/ipxe/resource/getinitramfs/alpha/".$this->session->getAlphasessionID()."\n";
- $result .= "imgverify initramfs $this->httpmode://$this->host/ipxe/resource/getsignature/file/initramfs/alpha/".$this->session->getAlphasessionID()." || exit\n";
+ $result .= "imgverify initramfs $this->httpmode://$this->host/ipxe/resource/getsignature/file/initramfs/alpha/".$this->session->getAlphasessionID()."\n";
if($bootmenuentry->getKcl() && $kcl != null){
$result .= "imgargs kernel $kcl alpha=".$this->session->getAlphasessionID()." file=$this->httpmode://$this->host/c/".$this->session->getAlphasessionID()."/default.tgz ".$bootmenuentry->getKclappend()."\n";
}else{
$result .= "imgargs kernel alpha=".$this->session->getAlphasessionID()." file=$this->httpmode://$this->host/c/".$this->session->getAlphasessionID()."/default.tgz ".$bootmenuentry->getKclappend()."\n";
}
- $result .= "boot";
+ $result .= "boot || echo BLA";
} else {
$result .= "chain http://".$_SERVER['HTTP_HOST']."/ipxe/vesamenu.c32 http://".$_SERVER['HTTP_HOST']."/ipxe/resource/getvesamenuconfig/serialnumber/$serialnumber/mac/$mac/error/session\n";