From 131538f5a7aac4befda4191571235f2b444b59e3 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 31 Mar 2010 11:06:58 +0100 Subject: 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). --- debian/changelog | 3 +++ debian/openssh-server.default | 6 ------ debian/openssh-server.init | 7 ------- 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 have the /usr/bin/X11 symlink available. I was taking advantage of the /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far enough in the past now that it's probably safe to just use /usr/bin. + * 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). -- Colin Watson Mon, 01 Mar 2010 12:24:41 +0000 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 @@ # Options to pass to sshd SSHD_OPTS= - -# OOM-killer adjustment for sshd (see -# linux/Documentation/filesystems/proc.txt; lower values reduce likelihood -# of being killed, while -17 means the OOM-killer will ignore sshd; set to -# the empty string to skip adjustment) -SSHD_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 umask 022 -export SSHD_OOM_ADJUST=-17 if test -f /etc/default/ssh; then . /etc/default/ssh fi -# Are we in a virtual environment that doesn't support modifying -# /proc/self/oom_adj? -if grep -q 'envID:.*[1-9]' /proc/self/status; then - unset SSHD_OOM_ADJUST -fi - . /lib/lsb/init-functions if [ -n "$2" ]; then -- cgit v1.2.3