summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/controllers/ResourceController.php4
-rw-r--r--application/modules/user/controllers/ConfigController.php1
2 files changed, 3 insertions, 2 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 8d52348..dd2919a 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -396,7 +396,7 @@ class ResourceController extends Zend_Controller_Action
$tmp_conf = "../resources/config/$hash";
mkdir($tmp_conf ,0777, true);
exec("tar -C $tmp_conf -xf ../resources/bootos/$bootosID/config/default.tgz",$restul);
- exec("tar -C $tmp_conf/rootfs/ -xf ../resources/config/etc.tgz");
+ //exec("tar -C $tmp_conf/rootfs/ -xf ../resources/config/etc.tgz");
$username = '';
$userpassword = '';
@@ -436,7 +436,7 @@ class ResourceController extends Zend_Controller_Action
if($loginname != '' && $password != ''){
// if($user->getHometypeID() == 1)
-// //exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p '".escapeshellarg("'".$password."'").' ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s '/bin/bash' -p '".$password."' ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s '/bin/bash' -p '".$password."' ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local");
+// //exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d '".escapeshellarg("'"./media/openslx-stick/home/".$loginname."'")."' ]; then \n\t\t chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -m -s /bin/bash -p '".escapeshellarg("'".$password."'").' ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s '/bin/bash' -p '".$password."' ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s '/bin/bash' -p '".$password."' ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local");
// else
exec("echo 'chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -m -s /bin/bash -p '".escapeshellarg("'".$password."'")."' '".escapeshellarg("'".$loginname."'")."'' >> $tmp_conf/initramfs/postinit.local",$restul);
}
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index eca5d54..9e324c4 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -262,6 +262,7 @@ class user_ConfigController extends Zend_Controller_Action
foreach($this->view->userlist as $user){
$user->setHometypeID("[".$user->getHometypeID()."] ".$hometypeMapper->find($user->getHometypeID())->getName());
}
+
}
public function adduserAction(){