From 03e1700a01dd3b425ec5d6cb7bd9684360900a53 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 07 Jun 2012 06:59:07 -0400
Subject: [PATCH] FS#1814 - Add option for custom php.ini for execution of ispconfig server.php script

---
 server/conf/bash.bashrc.master |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/conf/bash.bashrc.master b/server/conf/bash.bashrc.master
index 50b1bfd..edcaf7d 100644
--- a/server/conf/bash.bashrc.master
+++ b/server/conf/bash.bashrc.master
@@ -1,11 +1,13 @@
 
 <tmpl_if name='jailkit_chroot'>
 ## Hack for Jailkit User to change back to the logged in user ##
-if [ "$LOGNAME" != $USER ]; then
- export HOME=<tmpl_var name='home_dir'>$LOGNAME
- export USER=$LOGNAME
- export USERNAME=$LOGNAME
- cd $HOME
+if [ -n "$LOGNAME" ]; then
+ if [ "$LOGNAME" != $USER ]; then
+  export HOME=<tmpl_var name='home_dir'>$LOGNAME
+  export USER=$LOGNAME
+  export USERNAME=$LOGNAME
+  cd $HOME
+ fi
 fi
 
 ## Change machine hostname to site domain ##

--
Gitblit v1.9.1