summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2005-09-09 22:50:37 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2005-09-09 22:50:37 +0000
commit64d991605e24cf319c5880a0cf4a3fcf4ee15384 (patch)
tree8ec8c1da24ccdcf3b427930d287f752997177798
parente49ca50f6c38a79c25343f37cc692e3d5b71d188 (diff)
downloadds-64d991605e24cf319c5880a0cf4a3fcf4ee15384.tar.gz
ds-64d991605e24cf319c5880a0cf4a3fcf4ee15384.tar.xz
ds-64d991605e24cf319c5880a0cf4a3fcf4ee15384.zip
[160589] IBM JVM breaks on some machines/kernels : admin server fails to start
1) set an environment variable JAVA_COMPILER=NONE 2) added -Djava.compiler=NONE to jvm.option in admin-serv/config/jvm12.conf 3) added reconfig option "-r" to admin server ns-config and ns-update. Without passing the option, admin server's config file (e.g., server.xml) are not properly updated.
-rwxr-xr-xldap/cm/newinst/setup24
1 files changed, 15 insertions, 9 deletions
diff --git a/ldap/cm/newinst/setup b/ldap/cm/newinst/setup
index 3d7819ed..c3ea5191 100755
--- a/ldap/cm/newinst/setup
+++ b/ldap/cm/newinst/setup
@@ -172,6 +172,10 @@ fi
rm -f $sroot/setup/install.inf
+# Fix for "[160589] IBM JVM breaks on some machines/kernels :
+# admin server fails to start
+JAVA_COMPILER=NONE; export JAVA_COMPILER
+
echo "INFO Begin Setup . . ." | tee -a $logfile
# cat LICENSE.txt
if ! [ $silent ]; then
@@ -251,13 +255,10 @@ if ! [ $silent ]; then
# check if ds instance directory exists or not
# if it does, run ns-config with the reconfigure option
doreconfig=""
- for x in `ls -d slapd-*`
- do
- if [ -d $x ]; then
- doreconfig="-r"
- break
- fi
- done
+ ls -d slapd-* > /dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ doreconfig="-r"
+ fi
# first, run ds
cd bin/slapd/admin/bin
@@ -266,7 +267,7 @@ if ! [ $silent ]; then
# next, run admin
cd bin/admin
- ./ns-config -f $inffile -l $logfile -m $installmode || doExit
+ ./ns-config -f $inffile -l $logfile -m $installmode $doreconfig || doExit
cd ../..
fi
@@ -278,7 +279,12 @@ fi
`pwd`/bin/slapd/admin/bin/ns-update $silentarg $myargs -f $inffile | tee -a $logfile || doExit
-`pwd`/bin/admin/ns-update $silentarg $myargs -f $inffile | tee -a $logfile || doExit
+`pwd`/bin/admin/ns-update $doreconfig $silentarg $myargs -f $inffile | tee -a $logfile || doExit
+
+# Fix for "[160589] IBM JVM breaks on some machines/kernels :
+# admin server fails to start
+sed -e "s/jvm.option=\(.*\)/jvm.option=\1 -Djava.compiler=NONE/" admin-serv/config/jvm12.conf > admin-serv/config/jvm12.tmp
+mv admin-serv/config/jvm12.tmp admin-serv/config/jvm12.conf
echo "INFO Finished with setup, logfile is setup/setup.log" | tee -a $logfile
if [ -f setup/setup.log ] ; then