diff options
Diffstat (limited to 'meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch')
| -rw-r--r-- | meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch index eeeb89942b..63a6a2805b 100644 --- a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch +++ b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch @@ -1,22 +1,29 @@ -Busybox does not support ps -p so use pgrep +From c878a356712606549f7f188b62f7d1cae08a176e Mon Sep 17 00:00:00 2001 +From: Armin kuster <akuster808@gmail.com> +Date: Wed, 14 Oct 2020 22:48:31 -0700 +Subject: [PATCH] Busybox does not support ps -p so use pgrep Upstream-Status: Inappropriate [embedded specific] Based on changes from Diego Sueiro <Diego.Sueiro@arm.com> Signed-off-by: Armin kuster <akuster808@gmail.com> -Index: kea-1.7.10/src/bin/keactrl/keactrl.in -=================================================================== ---- kea-1.7.10.orig/src/bin/keactrl/keactrl.in -+++ kea-1.7.10/src/bin/keactrl/keactrl.in -@@ -137,8 +137,8 @@ check_running() { +--- + src/bin/keactrl/keactrl.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in +index 450e997..c353ca9 100644 +--- a/src/bin/keactrl/keactrl.in ++++ b/src/bin/keactrl/keactrl.in +@@ -149,8 +149,8 @@ check_running() { # Get the PID from the PID file (if it exists) get_pid_from_file "${proc_name}" if [ ${_pid} -gt 0 ]; then - # Use ps to check if PID is alive -- ps -p ${_pid} 1>/dev/null +- if ps -p ${_pid} 1>/dev/null; then + # Use pgrep and grep to check if PID is alive -+ pgrep -v 1 | grep ${_pid} 1>/dev/null - retcode=$? - if [ $retcode -eq 0 ]; then ++ if pgrep -v 1 | grep ${_pid} 1>/dev/null; then # No error, so PID IS ALIVE + _running=1 + fi |