packages: openssh/openssh.spec, openssh/opensshd.init rel 3; Drop obsolete ...

[arekm]

Author: arekm                        Date: Tue Jan 25 18:21:38 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
rel 3; Drop obsolete /proc/pid/oom_adj. New /proc/pid/oom_score_adj uses totally different values, so adjust val for it.

---- Files affected:
packages/openssh:
   openssh.spec (1.347 -> 1.348) , opensshd.init (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: packages/openssh/openssh.spec
diff -u packages/openssh/openssh.spec:1.347 packages/openssh/openssh.spec:1.348
--- packages/openssh/openssh.spec:1.347	Mon Jan 24 19:16:41 2011
+++ packages/openssh/openssh.spec	Tue Jan 25 19:21:33 2011
@@ -30,7 +30,7 @@
 Summary(uk.UTF-8):	OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:		openssh
 Version:	5.7p1
-Release:	2
+Release:	3
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
@@ -762,6 +762,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.348  2011/01/25 18:21:33  arekm
+rel 3; Drop obsolete /proc/pid/oom_adj. New /proc/pid/oom_score_adj uses totally different values, so adjust val for it.
+
 Revision 1.347  2011/01/24 18:16:41  arekm
 - rel 2; generate /etc/ssh/ssh_host_ecdsa_key
 

================================================================
Index: packages/openssh/opensshd.init
diff -u packages/openssh/opensshd.init:1.41 packages/openssh/opensshd.init:1.42
--- packages/openssh/opensshd.init:1.41	Mon Jan 24 19:16:42 2011
+++ packages/openssh/opensshd.init	Tue Jan 25 19:21:33 2011
@@ -8,7 +8,7 @@
 #		Ssh can be used for remote login, remote file copying, TCP port \
 #		forwarding etc. Ssh offers strong encryption and authentication.
 
-SSHD_OOM_ADJUST=-17
+SSHD_OOM_ADJUST=-1000
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -32,11 +32,7 @@
 adjust_oom() {
 	if [ -e /var/run/sshd.pid ]; then
 		for pid in $(cat /var/run/sshd.pid); do
-			if [ -e /proc/$pid/oom_score_adj ]; then
-				echo "$SSHD_OOM_ADJUST" 2>/dev/null > /proc/$pid/oom_score_adj
-			else
-				echo "$SSHD_OOM_ADJUST" 2>/dev/null > /proc/$pid/oom_adj
-			fi
+			echo "$SSHD_OOM_ADJUST" 2>/dev/null > /proc/$pid/oom_score_adj
 		done
 	fi
 }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/openssh.spec?r1=1.347&r2=1.348&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssh/opensshd.init?r1=1.41&r2=1.42&f=u