diff options
| author | michael pereira | 2011-04-26 16:44:32 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-26 16:44:32 +0200 |
| commit | 084be628972bef5eeb3b671547d68e6cae4d918b (patch) | |
| tree | 8d25fbfe1a53ff99708b5548e06b19d8c4c4f6ce /application/controllers/ResourceController.php | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-084be628972bef5eeb3b671547d68e6cae4d918b.tar.gz pbs2-084be628972bef5eeb3b671547d68e6cae4d918b.tar.xz pbs2-084be628972bef5eeb3b671547d68e6cae4d918b.zip | |
fixes
Diffstat (limited to 'application/controllers/ResourceController.php')
| -rw-r--r-- | application/controllers/ResourceController.php | 4 |
1 files changed, 2 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); } |