2 files changed, 8 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 3f3d7a9c7..fca432400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:5.1p1-6) UNRELEASED; urgency=low
 
   * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather
     than O_RDWR.
+  * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes:
+    #511771).
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 14 Jan 2009 11:30:07 +0000
 
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index a1cc67797..75ea71525 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -21,6 +21,12 @@ 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