diff options
| author | Simon | 2011-04-27 13:00:17 +0200 |
|---|---|---|
| committer | Simon | 2011-04-27 13:00:17 +0200 |
| commit | 8dc50cfaba65f53a02c09a11a9d284f48575499d (patch) | |
| tree | 4c788ef2705deac0e16659bac7c0166f23a989b4 /application/controllers | |
| parent | AutoBoot (diff) | |
| parent | usb (diff) | |
| download | pbs2-8dc50cfaba65f53a02c09a11a9d284f48575499d.tar.gz pbs2-8dc50cfaba65f53a02c09a11a9d284f48575499d.tar.xz pbs2-8dc50cfaba65f53a02c09a11a9d284f48575499d.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers')
| -rw-r--r-- | application/controllers/ResourceController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index eff9c7b..9ed857f 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -437,7 +437,7 @@ class ResourceController extends Zend_Controller_Action if($loginname != '' && $password != ''){ if($user->getHometypeID() == 1){ exec("echo 'modprobe usb_storage' >> $tmp_conf/initramfs/postinit.local"); - exec("echo 'echo -n 'Mounting OpenSLX-Stick:'; while [ ! -d /dev/sdb1 ] \n do \n\t usleep 500000 \n\t mdev -s \n\t echo -n . \n done' >> $tmp_conf/initramfs/postinit.local"); + exec("echo 'echo -n 'Mounting OpenSLX-Stick:'; while [ ! -e /dev/sdb1 ] \n do \n\t usleep 500000 \n\t mdev -s \n\t echo -n . \n done' >> $tmp_conf/initramfs/postinit.local"); exec("echo 'mkdir -p /media/openslx-stick' >> $tmp_conf/initramfs/postinit.local"); exec("echo 'mount /dev/sdb1 /media/openslx-stick' >> $tmp_conf/initramfs/postinit.local"); exec("echo 'if [ -d /media/openslx-stick/boot ]; then \n\t if [ ! -d '".escapeshellarg("'"."/media/openslx-stick/home/".$loginname."'")."' ]; then \n\t\t mkdir -p '".escapeshellarg("'"."/media/openslx-stick/home/".$loginname."'")."' \n\t\t chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -s /bin/bash -p '".escapeshellarg("'".$password."'")."' '".escapeshellarg("'".$loginname."'")."' \n\t else \n\t\t chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -s '/bin/bash' -p '".escapeshellarg("'".$password."'")."' '".escapeshellarg("'".$loginname."'")."' \n\t fi \n else \n\t chroot /mnt useradd -d '".escapeshellarg("'"."/home/".$loginname."'")."' -m -s '/bin/bash' -p '".escapeshellarg("'".$password."'")."' '".escapeshellarg("'".$loginname."'")."' \n fi' >> $tmp_conf/initramfs/postinit.local"); |