From 7fec1f38be2a783cce4fe1f63db1fcaad2f95d8b Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 1 May 2019 10:52:02 -0700
Subject: [PATCH] earlyoom: Stop using unsupported -k option

---
 net/scripts/install-earlyoom.sh | 4 ++--
 scripts/oom-monitor.sh          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/scripts/install-earlyoom.sh b/net/scripts/install-earlyoom.sh
index 587ab58463..ede8561c4a 100755
--- a/net/scripts/install-earlyoom.sh
+++ b/net/scripts/install-earlyoom.sh
@@ -18,8 +18,8 @@ else
   apt install --quiet --yes ./earlyoom_1.2-*_amd64.deb
 
   cat > earlyoom <<OOM
-  # use the kernel OOM killer, trigger at 20% available RAM,
-  EARLYOOM_ARGS="-k -m 20"
+  # trigger at 20% available RAM,
+  EARLYOOM_ARGS="-m 20"
 OOM
   cp earlyoom /etc/default/
   rm earlyoom
diff --git a/scripts/oom-monitor.sh b/scripts/oom-monitor.sh
index 52895e81f7..ee25d6f771 100755
--- a/scripts/oom-monitor.sh
+++ b/scripts/oom-monitor.sh
@@ -30,7 +30,7 @@ while read -r victim; do
   ./metrics-write-datapoint.sh "oom-killer,victim=$victim,hostname=$HOSTNAME killed=1"
 done < <( \
   tail --follow=name --retry -n0 $syslog \
-  | sed --unbuffered -n 's/^.* Out of memory: Kill process [1-9][0-9]* (\([^)]*\)) .*/\1/p' \
+  | sed --unbuffered -n "s/^.* earlyoom\[[0-9]*\]: Killing process .\(.*\). with signal .*/\1/p" \
 )
 
 exit 1