From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 33df321e1b0eea578250af4d5155a23f8891076a
Date: Mon, 19 May 2014 20:13:13 +0200
Message-ID: <20140519181313.E05F42112C@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7628066739976903719=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============7628066739976903719==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  33df321e1b0eea578250af4d5155a23f8891076a (commit)
      from  3555cff1028e046dea96b7f9c98fb982b884ca54 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 33df321e1b0eea578250af4d5155a23f8891076a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon May 19 20:12:00 2014 +0200

    Revert "sshd: add fallback for oom setings with old kernel."
    
    This reverts commit 1566fb6b5531247bd60d291716da1d5a017e9dce.
    xen kernel was dropped and in the code are missing brackets.

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/init.d/sshd | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Difference in files:
diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd
index 1d61a63..0ed8661 100644
--- a/src/initscripts/init.d/sshd
+++ b/src/initscripts/init.d/sshd
@@ -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"
 	) &
         ;;
 


hooks/post-receive
--
IPFire 2.x development tree

--===============7628066739976903719==--