From: Tom Clegg <tom@tomclegg.ca>
Date: Wed, 7 Oct 2020 20:37:06 +0000 (-0400)
Subject: Merge branch '16928-non-boolean-param-warning'
X-Git-Tag: 2.1.0~9
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/19f9424903f6b4997dc5a6c299faf70d5fdf4744?hp=a62f366d7c2b236aba0eceef37098a1fbe89c03d

Merge branch '16928-non-boolean-param-warning'

refs #16928

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

diff --git a/tools/arvbox/lib/arvbox/docker/runsu.sh b/tools/arvbox/lib/arvbox/docker/runsu.sh
index 674b157755..05d11dfde8 100755
--- a/tools/arvbox/lib/arvbox/docker/runsu.sh
+++ b/tools/arvbox/lib/arvbox/docker/runsu.sh
@@ -14,6 +14,9 @@ export HOME=$ARVADOS_CONTAINER_PATH
 
 chown arvbox /dev/stderr
 
+# Load our custom sysctl.conf entries
+/sbin/sysctl -p
+
 if test -z "$1" ; then
     exec chpst -u arvbox:arvbox:docker $0-service
 else