Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
Michael Tremer
2014-05-20 11:25:48 +02:00
13 changed files with 696 additions and 12 deletions

View File

@@ -43,10 +43,7 @@ case "$1" in
(
sleep 3
pid=$(cat /var/run/sshd.pid 2>/dev/null)
[ -n "${pid}" ] && [ -e "/proc/${pid}/oom_score_adj" ] && \
echo "-16" > "/proc/${pid}/oom_score_adj" || \
[ -e "/proc/${pid}/oom_adj" ] && \
echo "-16" > "/proc/${pid}/oom_adj"
[ -n "${pid}" ] && echo "-16" > "/proc/${pid}/oom_score_adj"
) &
;;