summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authormichael pereira2011-04-26 10:59:01 +0200
committermichael pereira2011-04-26 10:59:01 +0200
commit54d6157376b31691b145ca29ac91a20b435f1456 (patch)
tree6d0f390a6297c75d86f6ebcccc8c7d8f1c5040d0 /application/controllers
parentsuspended fix (diff)
downloadpbs2-54d6157376b31691b145ca29ac91a20b435f1456.tar.gz
pbs2-54d6157376b31691b145ca29ac91a20b435f1456.tar.xz
pbs2-54d6157376b31691b145ca29ac91a20b435f1456.zip
home on usb and draggable bootmenulist
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/ResourceController.php17
1 files changed, 10 insertions, 7 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 1c28d12..9d7af7f 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -395,9 +395,9 @@ class ResourceController extends Zend_Controller_Action
$hash = md5(microtime(1));
$tmp_conf = "../resources/config/$hash";
mkdir($tmp_conf ,0777, true);
- exec("tar -C $tmp_conf -xvf ../resources/bootos/$bootosID/config/default.tgz",$restul);
+ 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("cp ../resources/config/loginfiles/* $path_userconf/rootfs/etc/");
$username = '';
$userpassword = '';
@@ -429,20 +429,23 @@ class ResourceController extends Zend_Controller_Action
if($user->getHometypeID() == 2){
$homepath = $user->getHomepath();
}elseif($user->getHometypeID() == 1){
- $homepath = "/home/$loginname";
+ $homepath = "/media/openslx-stick/home/$loginname";
}else{
$homepath = "/home/$loginname";
}
- if($loginname != '' && $password != '')
- exec("echo 'chroot /mnt useradd -d ".$homepath." -m -p \"".$password."\" ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul);
-
+ 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);
+ }
}
// create the gzipped tarfile.
chdir($tmp_conf);
passthru( "tar cz *");
- exec("rm -rf $tmp_conf");
+ exec("rm -rf ../$hash");
}
}else{