Merge pull request #7018 from tianon/dash

Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support Upstream-commit: f77cde6a93506aac97aa891cb42e3586a58b4ba7 Component: engine
2014-07-14 14:05:04 -06:00
parent b2c113f9b8 2226522e72
commit 412e63980b
1 changed files with 5 additions and 1 deletions
@@ -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 \