summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/openssh-server.default6
-rw-r--r--debian/openssh-server.init7
3 files changed, 3 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index e792fc91b..02909e99f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,9 @@ openssh (1:5.4p1-1) UNRELEASED; urgency=low
46 have the /usr/bin/X11 symlink available. I was taking advantage of the 46 have the /usr/bin/X11 symlink available. I was taking advantage of the
47 /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far 47 /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far
48 enough in the past now that it's probably safe to just use /usr/bin. 48 enough in the past now that it's probably safe to just use /usr/bin.
49 * Remove SSHD_OOM_ADJUST configuration. sshd now unconditionally makes
50 itself non-OOM-killable, and doesn't require configuration to avoid log
51 spam in virtualisation containers (closes: #555625).
49 52
50 -- Colin Watson <cjwatson@debian.org> Mon, 01 Mar 2010 12:24:41 +0000 53 -- Colin Watson <cjwatson@debian.org> Mon, 01 Mar 2010 12:24:41 +0000
51 54
diff --git a/debian/openssh-server.default b/debian/openssh-server.default
index 9680d3427..304042224 100644
--- a/debian/openssh-server.default
+++ b/debian/openssh-server.default
@@ -3,9 +3,3 @@
3 3
4# Options to pass to sshd 4# Options to pass to sshd
5SSHD_OPTS= 5SSHD_OPTS=
6
7# OOM-killer adjustment for sshd (see
8# linux/Documentation/filesystems/proc.txt; lower values reduce likelihood
9# of being killed, while -17 means the OOM-killer will ignore sshd; set to
10# the empty string to skip adjustment)
11SSHD_OOM_ADJUST=-17
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