浏览代码

Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Tianon Gravi 11 年之前
父节点
当前提交
4f0fbb885e
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      contrib/init/sysvinit-debian/docker

+ 5 - 1
contrib/init/sysvinit-debian/docker

@@ -89,7 +89,11 @@ case "$1" in
 		chgrp docker "$DOCKER_LOGFILE"
 		chgrp docker "$DOCKER_LOGFILE"
 
 
 		ulimit -n 1048576
 		ulimit -n 1048576
-		ulimit -u 1048576
+		if [ "$BASH" ]; then
+			ulimit -u 1048576
+		else
+			ulimit -p 1048576
+		fi
 
 
 		log_begin_msg "Starting $DOCKER_DESC: $BASE"
 		log_begin_msg "Starting $DOCKER_DESC: $BASE"
 		start-stop-daemon --start --background \
 		start-stop-daemon --start --background \