From 5bd2aa25f334944f4464fbb0086672286865ae7c Mon Sep 17 00:00:00 2001 From: florian030 <florian@schaal-24.de> Date: Mon, 17 Feb 2014 07:51:42 -0500 Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3 --- server/scripts/create_jailkit_user.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/scripts/create_jailkit_user.sh b/server/scripts/create_jailkit_user.sh index da01f9a..5e1060b 100755 --- a/server/scripts/create_jailkit_user.sh +++ b/server/scripts/create_jailkit_user.sh @@ -21,12 +21,12 @@ CHROOT_P_USER=$5 CHROOT_P_USER_HOMEDIR=$6 -### Add the chroot user ### -jk_jailuser -n -s $CHROOT_SHELL -j $CHROOT_HOMEDIR $CHROOT_USERNAME - ### Reconfigure the chroot home directory for the user ### usermod --home=$CHROOT_HOMEDIR/.$CHROOT_USERHOMEDIR $CHROOT_USERNAME 2>/dev/null +### Add the chroot user ### +jk_jailuser -n -s $CHROOT_SHELL -j $CHROOT_HOMEDIR $CHROOT_USERNAME + ### We have to reconfigure the chroot home directory for the parent user ### if [ "$CHROOT_P_USER" != "" ]; then usermod --home=$CHROOT_HOMEDIR/.$CHROOT_P_USER_HOMEDIR $CHROOT_P_USER 2>/dev/null -- Gitblit v1.9.1