[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 22fd89c656d3a36a881a1ed2a02a544b91876e47

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 1804 bytes --]

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, next has been updated
       via  22fd89c656d3a36a881a1ed2a02a544b91876e47 (commit)
      from  f942937c29ca76a7f153fc16ea13157eb4cf05cc (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 22fd89c656d3a36a881a1ed2a02a544b91876e47
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Feb 24 21:36:15 2014 +0100

    sshd: Fix warning that oom_adj is deprecated.
    
    Also make startup faster.

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

Summary of changes:
 src/initscripts/init.d/sshd | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd
index 8aab83f..0ed8661 100644
--- a/src/initscripts/init.d/sshd
+++ b/src/initscripts/init.d/sshd
@@ -37,10 +37,14 @@ case "$1" in
 
         [ -e "/var/ipfire/remote/enablessh" ] || exit 0 # SSH is not enabled
         boot_mesg "Starting SSH Server..."
-        # Also prevent ssh from being killed by out of memory conditions
         loadproc /usr/sbin/sshd 
-        sleep 3
-        echo "-16" >/proc/`cat /var/run/sshd.pid`/oom_adj
+
+        # Also prevent ssh from being killed by out of memory conditions
+	(
+		sleep 3
+		pid=$(cat /var/run/sshd.pid 2>/dev/null)
+		[ -n "${pid}" ] && echo "-16" > "/proc/${pid}/oom_score_adj"
+	) &
         ;;
 
     stop)


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