summaryrefslogtreecommitdiff
path: root/debian/openssh-server.init
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-03-31 11:06:58 +0100
committerColin Watson <cjwatson@debian.org>2010-03-31 11:06:58 +0100
commit131538f5a7aac4befda4191571235f2b444b59e3 (patch)
treeec1318c54ce395d708ec4923c840144331007991 /debian/openssh-server.init
parent56ea360619c4bbe1b604add62d3cbf472392617f (diff)
Remove SSHD_OOM_ADJUST configuration. sshd now unconditionally makes
itself non-OOM-killable, and doesn't require configuration to avoid log spam in virtualisation containers (closes: #555625).
Diffstat (limited to 'debian/openssh-server.init')
-rw-r--r--debian/openssh-server.init7
1 files changed, 0 insertions, 7 deletions
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index e8b446046..62bcc21d4 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -18,17 +18,10 @@ test -x /usr/sbin/sshd || exit 0
18 18
19umask 022 19umask 022
20 20
21export SSHD_OOM_ADJUST=-17
22if test -f /etc/default/ssh; then 21if test -f /etc/default/ssh; then
23 . /etc/default/ssh 22 . /etc/default/ssh
24fi 23fi
25 24
26# Are we in a virtual environment that doesn't support modifying
27# /proc/self/oom_adj?
28if grep -q 'envID:.*[1-9]' /proc/self/status; then
29 unset SSHD_OOM_ADJUST
30fi
31
32. /lib/lsb/init-functions 25. /lib/lsb/init-functions
33 26
34if [ -n "$2" ]; then 27if [ -n "$2" ]; then