From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 24 Feb 2014 20:36:15 +0000 (+0100)
Subject: sshd: Fix warning that oom_adj is deprecated.
X-Git-Tag: v2.15-rc1~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22fd89c656d3a36a881a1ed2a02a544b91876e47;p=people%2Fms%2Fipfire-2.x.git

sshd: Fix warning that oom_adj is deprecated.

Also make startup faster.
---

diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd
index 8aab83fa5e..0ed8661653 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)