diff options
| author | Eirik Nygaard <eirik.nygaard@yahooinc.com> | 2022-10-24 14:34:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-24 14:34:16 +0200 |
| commit | c057ce5898ed3d4e443b438dbec5d23c2a97a3b2 (patch) | |
| tree | b439f23b9c9b3d5db527a088b51e707dff460cad /configserver/src/main/sh/start-configserver | |
| parent | fa29e75a71b49fc3925349457bb43de03b6d60d8 (diff) | |
| parent | 866f746d5d608782f6de38af93bf5e2305cbf781 (diff) | |
Merge pull request #24557 from vespa-engine/jonmv/revert-startup-script-changesv8.73.7
Jonmv/revert startup script changes MERGEOK
Diffstat (limited to 'configserver/src/main/sh/start-configserver')
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 8e7a9d7839a..f223c0a8fb9 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}" ] && [ "$(id -u)" -eq 0 ]; then + if [ "${VESPA_USER}" ] && [ "${VESPA_UNPRIVILEGED}" != yes ]; 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}" ] && [ "$(id -u)" -eq 0 ]; then - chown ${VESPA_USER} $1 + if [ "${VESPA_USER}" ] && [ "${VESPA_UNPRIVILEGED}" != yes ]; then + chown ${VESPA_USER} $1 fi chmod 755 $1 } |