Merge pull request #24548 from vespa-engine/arnej/common-handle-env-root

* apply new common bootstrap

9 files changed, 32 insertions, 5 deletions

diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index 9a9b0777596..d6f53046b47 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 [ "$VESPA_HOME" ] || { echo "Missing VESPA_HOME variable" 1>&2; exit 1; }
@@ -87,7 +90,7 @@ if [ "$VESPA_GROUP" = "" ]; then
 fi
 IS_ROOT=$([ "$(id -ru)" == "0" ] && echo true || echo false)
 
-cd $VESPA_HOME || { echo "Cannot cd to $VESPA_HOME" 1>&2; exit 1; }
+cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
 
 fixdir () {
     if [ $# != 4 ]; then
@@ -100,11 +103,11 @@ fixdir () {
         local user=${stat% *}
         local group=${stat#* }
         if [ "$1" != "$user" ]; then
-            echo "Wrong owner for $VESPA_HOME/$4, expected $1, was $user"
+            echo "Wrong owner for ${VESPA_HOME}/$4, expected $1, was $user"
             exit 1
         fi
         if [ "$2" != "$group" ]; then
-            echo "Wrong group for $VESPA_HOME/$4, expected $2, was $group"
+            echo "Wrong group for ${VESPA_HOME}/$4, expected $2, was $group"
             exit 1
         fi
     else
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh
index 6a6720e7d9c..38c081481a6 100755
--- a/vespabase/src/start-cbinaries.sh
+++ b/vespabase/src/start-cbinaries.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 bname=`basename $0`
@@ -99,7 +102,7 @@ configure_valgrind () {
     if which valgrind >/dev/null 2>&1; then
         if check_bname_in_value "$VESPA_USE_VALGRIND"; then
             no_valgrind=false
-            valgrind_log=$VESPA_HOME/tmp/valgrind.$bname.log.$$
+            valgrind_log=${VESPA_HOME}/tmp/valgrind.$bname.log.$$
             case $VESPA_VALGRIND_OPT in
                 *callgrind*) use_callgrind=true;;
             esac
diff --git a/vespabase/src/start-tool.sh b/vespabase/src/start-tool.sh
index 6e04db7450e..a7845f6d623 100755
--- a/vespabase/src/start-tool.sh
+++ b/vespabase/src/start-tool.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 use_configserver_if_needed
diff --git a/vespabase/src/start-vespa-base.sh b/vespabase/src/start-vespa-base.sh
index 345009e0127..889a9f0298b 100755
--- a/vespabase/src/start-vespa-base.sh
+++ b/vespabase/src/start-vespa-base.sh
@@ -72,9 +72,12 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-cd $VESPA_HOME || { echo "Cannot cd to $VESPA_HOME" 1>&2; exit 1; }
+cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
 
 fixlimits
 checkjava
diff --git a/vespabase/src/stop-vespa-base.sh b/vespabase/src/stop-vespa-base.sh
index f6dacf32076..6e699758259 100755
--- a/vespabase/src/stop-vespa-base.sh
+++ b/vespabase/src/stop-vespa-base.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh
index 8bdfc9560df..7927422ba9c 100755
--- a/vespabase/src/vespa-start-configserver.sh
+++ b/vespabase/src/vespa-start-configserver.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 ${VESPA_HOME}/bin/vespa-prestart.sh || exit 1
diff --git a/vespabase/src/vespa-start-services.sh b/vespabase/src/vespa-start-services.sh
index 9e79f9ae961..6dbd0eefa83 100755
--- a/vespabase/src/vespa-start-services.sh
+++ b/vespabase/src/vespa-start-services.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 ${VESPA_HOME}/bin/vespa-prestart.sh || exit 1
diff --git a/vespabase/src/vespa-stop-configserver.sh b/vespabase/src/vespa-stop-configserver.sh
index 71e07b0a384..8c51509160e 100755
--- a/vespabase/src/vespa-stop-configserver.sh
+++ b/vespabase/src/vespa-stop-configserver.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 willrun=${VESPA_HOME}/libexec/vespa/stop-configserver
diff --git a/vespabase/src/vespa-stop-services.sh b/vespabase/src/vespa-stop-services.sh
index 7c355e07575..167d86af853 100755
--- a/vespabase/src/vespa-stop-services.sh
+++ b/vespabase/src/vespa-stop-services.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 willrun=${VESPA_HOME}/libexec/vespa/stop-vespa-base.sh