Serialize the service startup in arvbox by adding a dependency on the

[arvados.git] / tools / arvbox / lib / arvbox / docker / runsu.sh

diff --git a/tools/arvbox/lib/arvbox/docker/runsu.sh b/tools/arvbox/lib/arvbox/docker/runsu.sh
index 1557d0952bc716f85c7e9ca9a94a3a0d377615e1..55edce3f9d8b032024d3c737f32c891fcd36224b 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/runsu.sh
+++ b/tools/arvbox/lib/arvbox/docker/runsu.sh
@@ -1,11 +1,21 @@
 #!/bin/sh
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 HOSTUID=$(ls -nd /usr/src/arvados | sed 's/ */ /' | cut -d' ' -f4)
 HOSTGID=$(ls -nd /usr/src/arvados | sed 's/ */ /' | cut -d' ' -f5)
 
-flock /var/lib/arvados/createusers.lock /usr/local/lib/arvbox/createusers.sh
+export ARVADOS_CONTAINER_PATH=/var/lib/arvados-arvbox
 
-export HOME=/var/lib/arvados
+flock $ARVADOS_CONTAINER_PATH/createusers.lock /usr/local/lib/arvbox/createusers.sh
+
+export HOME=$ARVADOS_CONTAINER_PATH
+
+chown arvbox /dev/stderr
+
+# Load our custom sysctl.conf entries
+/sbin/sysctl -p >/dev/null
 
 if test -z "$1" ; then
     exec chpst -u arvbox:arvbox:docker $0-service