You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2016/03/11 02:57:25 UTC
[1/2] karaf git commit: KARAF-4413 : Can't start karaf on solaris 10
Repository: karaf
Updated Branches:
refs/heads/master e93c57d24 -> b27fdd379
KARAF-4413 : Can't start karaf on solaris 10
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/efaccd96
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/efaccd96
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/efaccd96
Branch: refs/heads/master
Commit: efaccd969f79725eced2779f42adfbf67d90b855
Parents: 424a830
Author: lburgazzoli <lb...@gmail.com>
Authored: Thu Mar 10 16:26:00 2016 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Thu Mar 10 16:26:00 2016 +0100
----------------------------------------------------------------------
.../base/src/main/resources/resources/bin/karaf | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/efaccd96/assemblies/features/base/src/main/resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/karaf b/assemblies/features/base/src/main/resources/resources/bin/karaf
index 25ee41f..585705e 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/resources/resources/bin/karaf
@@ -326,13 +326,11 @@ setupDefaults() {
checkRootInstance() {
ROOT_INSTANCE_RUNNING=false
- if [ -f "${KARAF_HOME}/instances/instance.properties" ];
- then
- ROOT_INSTANCE_PID=$(sed -n -e '/item.0.pid/ s/.*\= *//p' "${KARAF_HOME}/instances/instance.properties")
- ROOT_INSTANCE_NAME=$(sed -n -e '/item.0.name/ s/.*\= *//p' "${KARAF_HOME}/instances/instance.properties")
- if [ "$ROOT_INSTANCE_PID" -ne "0" ]; then
- if ps ax | grep -v grep | grep "$ROOT_INSTANCE_PID" > /dev/null
- then
+ if [ -f "${KARAF_HOME}/instances/instance.properties" ]; then
+ ROOT_INSTANCE_PID=`sed -n -e '/item.0.pid/ s/.*\= *//p' "${KARAF_HOME}/instances/instance.properties"`
+ ROOT_INSTANCE_NAME=`sed -n -e '/item.0.name/ s/.*\= *//p' "${KARAF_HOME}/instances/instance.properties"`
+ if [ "$ROOT_INSTANCE_PID" -ne "0" ]; then
+ if [ `ps -p "$ROOT_INSTANCE_PID" 2> /dev/null | grep -c "$ROOT_INSTANCE_PID" 2> /dev/null` -eq '1' ]; then
ROOT_INSTANCE_RUNNING=true
fi
fi
[2/2] karaf git commit: Merge branch 'KARAF-4413' of
https://github.com/lburgazzoli/apache-karaf
Posted by ff...@apache.org.
Merge branch 'KARAF-4413' of https://github.com/lburgazzoli/apache-karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b27fdd37
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b27fdd37
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b27fdd37
Branch: refs/heads/master
Commit: b27fdd379e47cf8aecbaea8119b9b74e26c3dbfe
Parents: e93c57d efaccd9
Author: Freeman Fang <fr...@gmail.com>
Authored: Fri Mar 11 09:57:07 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Fri Mar 11 09:57:07 2016 +0800
----------------------------------------------------------------------
.../base/src/main/resources/resources/bin/karaf | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------