From 361156e8395d3837a4cd0ff7a417d3ca8dc16a40 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 27 Feb 2014 12:31:52 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'

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

diff --git a/server/scripts/create_jailkit_user.sh b/server/scripts/create_jailkit_user.sh
index efe0603..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
 
+### 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
 
-### Reconfigure the chroot home directory for the user ###
-usermod --home=$CHROOT_HOMEDIR/.$CHROOT_USERHOMEDIR $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