diff options
| author | michael pereira | 2011-04-19 15:43:47 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-19 15:43:47 +0200 |
| commit | 1a82b501d9b85c37595c227743e097932f9b0450 (patch) | |
| tree | a9c768959eb8029985eb64b5d4b3c20d76c55cd7 /application/modules/user | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-1a82b501d9b85c37595c227743e097932f9b0450.tar.gz pbs2-1a82b501d9b85c37595c227743e097932f9b0450.tar.xz pbs2-1a82b501d9b85c37595c227743e097932f9b0450.zip | |
Resource Controller fix
Diffstat (limited to 'application/modules/user')
| -rw-r--r-- | application/modules/user/controllers/BootosController.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php index 796a2f7..d93f0cf 100644 --- a/application/modules/user/controllers/BootosController.php +++ b/application/modules/user/controllers/BootosController.php @@ -169,7 +169,7 @@ class user_BootosController extends Zend_Controller_Action $hash = md5(microtime(1)); exec("wget -O '".$path_tmp."kernel".$hash."' ".escapeshellcmd($bootos->getPath_kernel())." 2>&1 | grep 'saved'", $status); exec("wget -O '".$path_tmp."initramfs".$hash."' ".escapeshellcmd($bootos->getPath_init())." 2>&1 | grep 'saved'", $status2); - exec("wget -O '".$path_tmp."config".$hash."' ".escapeshellcmd($bootos->getPath_config())." 2>&1 | grep 'saved'", $status3); + exec("wget -O '".$path_tmp."default".$hash."' ".escapeshellcmd($bootos->getPath_config())." 2>&1 | grep 'saved'", $status3); if(!array_pop($status) && $bootos->getPath_kernel() != null || !array_pop($status2) && $bootos->getPath_init() != null || !array_pop($status3) && $bootos->getPath_config() != null ){ $this->view->bootosForm = $bootosForm; @@ -191,7 +191,7 @@ class user_BootosController extends Zend_Controller_Action exec("mv ../resources/bootos/kernel$hash $kernelpath"."kernel"); exec("mv ../resources/bootos/initramfs$hash $initpath"."initramfs"); - exec("mv ../resources/bootos/config$hash $configpath"."config.tgz"); + exec("mv ../resources/bootos/config$hash $configpath"."default.tgz"); }catch(Zend_Exception $e) { @@ -221,7 +221,7 @@ class user_BootosController extends Zend_Controller_Action if(is_file("../resources/bootos/$bootosID/kernel/kernel") && is_file("../resources/bootos/$bootosID/initramfs/initramfs") && is_file("../resources/bootos/$bootosID/config/config.tgz")){ $kernelolddate = filemtime("../resources/bootos/".$bootosID."/kernel/kernel"); $initolddate = filemtime("../resources/bootos/".$bootosID."/initramfs/initramfs"); - $configolddate = filemtime("../resources/bootos/".$bootosID."/config/config.tgz"); + $configolddate = filemtime("../resources/bootos/".$bootosID."/config/default.tgz"); } else { @@ -282,7 +282,7 @@ class user_BootosController extends Zend_Controller_Action exec("mv ../resources/bootos/kernel$hash $kernelpath"."kernel"); exec("mv ../resources/bootos/initramfs$hash $initpath"."initramfs"); - exec("mv ../resources/bootos/config$hash $initpath"."config.tgz"); + exec("mv ../resources/bootos/config$hash $initpath"."default.tgz"); $this->_redirect('/user/bootos/index/page/'.$this->page.'/updateresult/ok'); } @@ -376,7 +376,7 @@ class user_BootosController extends Zend_Controller_Action exec("mv ../resources/bootos/kernel$hash $kernelpath"."kernel"); exec("mv ../resources/bootos/initramfs$hash $initpath"."initramfs"); - exec("mv ../resources/bootos/config$hash $initpath"."config.tgz"); + exec("mv ../resources/bootos/config$hash $initpath"."default.tgz"); } try { |