diff options
| author | Simon | 2011-04-26 14:28:45 +0200 |
|---|---|---|
| committer | Simon | 2011-04-26 14:28:45 +0200 |
| commit | 7e61aa0760aad7b6bff8aa1b82946dec0421313a (patch) | |
| tree | 2619345fb287c2d97b70775380baa0bb9c1eecef /application/controllers/ResourceController.php | |
| parent | debug auskommentiert (diff) | |
| parent | db (diff) | |
| download | pbs2-7e61aa0760aad7b6bff8aa1b82946dec0421313a.tar.gz pbs2-7e61aa0760aad7b6bff8aa1b82946dec0421313a.tar.xz pbs2-7e61aa0760aad7b6bff8aa1b82946dec0421313a.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers/ResourceController.php')
| -rw-r--r-- | application/controllers/ResourceController.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 9d7af7f..aad9ab8 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 = ''; @@ -435,10 +435,10 @@ 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 \"".$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 ".$homepath." -m -s /bin/bash -p \"".$password."\" ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul); +// 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"); +// else + exec("echo 'chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -m -s /bin/bash -p '".escapeshellarg("'".$password."'")."' '".escapeshellarg("'".$loginname."'")."'' >> $tmp_conf/initramfs/postinit.local",$restul); } } |