mirror of
git://git.yoctoproject.org/poky
synced 2026-09-27 08:11:58 +00:00
88e9607d71
Changelog: ========= -The library version numbers have been bumped up for the Kea 2.4.1 stable release. -Fixed interface redetection which had stopped working since Kea 2.3.6. -Fixed a race condition in free lease queue allocator fix-multilib-conflict.patch fix_pid_keactrl.patch refreshed for 2.4. (From OE-Core rev: fcf269bd8fc607882960cebc2c6e2e557517647d) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7afab39fd1c3239df3bb2fa49b79a5efaaaf9db6) Signed-off-by: Steve Sakoman <steve@sakoman.com>
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
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>
|
|
|
|
---
|
|
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
|
|
- if ps -p ${_pid} 1>/dev/null; then
|
|
+ # Use pgrep and grep to check if PID is alive
|
|
+ if pgrep -v 1 | grep ${_pid} 1>/dev/null; then
|
|
# No error, so PID IS ALIVE
|
|
_running=1
|
|
fi
|