From 119b3ea0627b882561bd326cd7833692578c03e1 Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Sat, 07 Jul 2012 09:33:38 -0400
Subject: [PATCH] corrected icoLoginAs in all templates

---
 server/scripts/create_jailkit_chroot.sh |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/scripts/create_jailkit_chroot.sh b/server/scripts/create_jailkit_chroot.sh
index 07460df..6ffa889 100755
--- a/server/scripts/create_jailkit_chroot.sh
+++ b/server/scripts/create_jailkit_chroot.sh
@@ -21,10 +21,13 @@
 chown root:root $CHROOT_HOMEDIR
 
 ## Initialize the chroot into the specified directory with the specified applications
-jk_init -f -k -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS
+jk_init -f -k -c /etc/jailkit/jk_init.ini -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS
 
 ## Create the temp directory
-mkdir $CHROOT_HOMEDIR/tmp
+if [ ! -d "$CHROOT_HOMEDIR/tmp" ]
+then
+  mkdir $CHROOT_HOMEDIR/tmp
+fi
 chmod a+rwx $CHROOT_HOMEDIR/tmp
 
 
@@ -32,4 +35,9 @@
 mkdir $CHROOT_HOMEDIR/var
 mkdir $CHROOT_HOMEDIR/var/run
 mkdir $CHROOT_HOMEDIR/var/run/mysqld
-ln /var/run/mysqld/mysqld.sock $CHROOT_HOMEDIR/var/run/mysqld/mysqld.sock
+
+# ln /var/run/mysqld/mysqld.sock $CHROOT_HOMEDIR/var/run/mysqld/mysqld.sock
+if [ -e "/var/run/mysqld/mysqld.sock" ]
+then
+  ln /var/run/mysqld/mysqld.sock $CHROOT_HOMEDIR/var/run/mysqld/mysqld.sock
+fi

--
Gitblit v1.9.1