From 2226522e72de2b8e99e00394a96c2ce5da87bfcf Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 14 Jul 2014 12:34:04 -0600 Subject: [PATCH] Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) Upstream-commit: 4f0fbb885eb6b561fd6e4ba26b35cb30dd8d9121 Component: engine --- components/engine/contrib/init/sysvinit-debian/docker | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/engine/contrib/init/sysvinit-debian/docker b/components/engine/contrib/init/sysvinit-debian/docker index 6250cae053..d79d9c6c07 100755 --- a/components/engine/contrib/init/sysvinit-debian/docker +++ b/components/engine/contrib/init/sysvinit-debian/docker @@ -89,7 +89,11 @@ case "$1" in chgrp docker "$DOCKER_LOGFILE" ulimit -n 1048576 - ulimit -u 1048576 + if [ "$BASH" ]; then + ulimit -u 1048576 + else + ulimit -p 1048576 + fi log_begin_msg "Starting $DOCKER_DESC: $BASE" start-stop-daemon --start --background \