Merge pull request #24558 from vespa-engine/revert-24557-jonmv/revert-startup-script-changes

Revert "Jonmv/revert startup script changes"

1 files changed, 3 insertions, 3 deletions

diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index f223c0a8fb9..8e7a9d7839a 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -78,7 +78,7 @@ cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
 
 fixfile () {
     if [ -f $1 ]; then
-        if [ "${VESPA_USER}" ] && [ "${VESPA_UNPRIVILEGED}" != yes ]; then
+        if [ "${VESPA_USER}" ] && [ "$(id -u)" -eq 0 ]; then
             chown ${VESPA_USER} $1
         fi
         chmod 644 $1
@@ -90,8 +90,8 @@ fixddir () {
        echo "Creating data directory $1"
        mkdir -p $1 || exit 1
     fi
-    if [ "${VESPA_USER}" ] && [ "${VESPA_UNPRIVILEGED}" != yes ]; then
-       chown ${VESPA_USER} $1
+    if [ "${VESPA_USER}" ] && [ "$(id -u)" -eq 0 ]; then
+        chown ${VESPA_USER} $1
     fi
     chmod 755 $1
 }