From dbf57dddf7ef07a0168ad0c1d64de0735a9c5804 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 31 Mar 2016 02:09:24 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 server/scripts/create_jailkit_user.sh |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/scripts/create_jailkit_user.sh b/server/scripts/create_jailkit_user.sh
index 893046c..5e1060b 100755
--- a/server/scripts/create_jailkit_user.sh
+++ b/server/scripts/create_jailkit_user.sh
@@ -21,13 +21,13 @@
 CHROOT_P_USER=$5
 CHROOT_P_USER_HOMEDIR=$6
 
-### Add the chroot user ###
-jk_jailuser  -s $CHROOT_SHELL -j $CHROOT_HOMEDIR $CHROOT_USERNAME
-
 ### Reconfigure the chroot home directory for the user ###
-usermod --home=$CHROOT_HOMEDIR/.$CHROOT_USERHOMEDIR $CHROOT_USERNAME
+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
+  usermod --home=$CHROOT_HOMEDIR/.$CHROOT_P_USER_HOMEDIR $CHROOT_P_USER 2>/dev/null
 fi
\ No newline at end of file

--
Gitblit v1.9.1