summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/openssh-server.init2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 7fc742c32..c3b41dd66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1openssh (1:4.7p1-7) UNRELEASED; urgency=low
2
3 * Ignore errors writing to oom_adj (closes: #473573).
4
5 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2008 16:23:26 +0100
6
1openssh (1:4.7p1-6) unstable; urgency=low 7openssh (1:4.7p1-6) unstable; urgency=low
2 8
3 * Disable the Linux kernel's OOM-killer for the sshd parent; tweak 9 * Disable the Linux kernel's OOM-killer for the sshd parent; tweak
diff --git a/debian/openssh-server.init b/debian/openssh-server.init
index 8c38eedf5..862d117c1 100644
--- a/debian/openssh-server.init
+++ b/debian/openssh-server.init
@@ -75,7 +75,7 @@ adjust_oom() {
75 if [ -e /var/run/sshd.pid ]; then 75 if [ -e /var/run/sshd.pid ]; then
76 PID="$(head -n1 /var/run/sshd.pid)" 76 PID="$(head -n1 /var/run/sshd.pid)"
77 if [ -e "/proc/$PID/oom_adj" ]; then 77 if [ -e "/proc/$PID/oom_adj" ]; then
78 printf '%s' "$SSHD_OOM_ADJUST" >"/proc/$PID/oom_adj" 78 printf '%s' "$SSHD_OOM_ADJUST" >"/proc/$PID/oom_adj" || true
79 fi 79 fi
80 fi 80 fi
81} 81}