summaryrefslogtreecommitdiff
path: root/meta-google
diff options
context:
space:
mode:
authorWilliam A. Kennington III <wak@google.com>2022-05-06 12:11:10 +0300
committerWilliam A. Kennington III <wak@google.com>2022-05-10 00:05:41 +0300
commit13bb84dc4a8eee75c0dfd79916e073f93e45cf81 (patch)
tree1dde2cd6c7b463628df8e96c05a6018458fac05d /meta-google
parent5a9293114ff85c763cccbb8814d07f82ebdd8592 (diff)
downloadopenbmc-13bb84dc4a8eee75c0dfd79916e073f93e45cf81.tar.xz
meta-google: gbmc-bridge: Fix DHCP term
The previous wait call was unable to monitor the process since it didn't start as a child of the term script. Instead, we just need to poll proc until the process has completed as this information is accessible. Change-Id: I8dec1218b5f451aa756329420211b3f6de500d7f Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'meta-google')
-rw-r--r--meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp-term.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp-term.sh b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp-term.sh
index 29fbbdeda5..6a0c8b0e61 100644
--- a/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp-term.sh
+++ b/meta-google/recipes-google/networking/gbmc-bridge/gbmc-br-dhcp-term.sh
@@ -25,7 +25,9 @@ sleep $((60 * wait_min))
# If the DHCP configuration process is running, wait for it to finish
if pid="$(cat /run/gbmc-br-dhcp.pid 2>/dev/null)"; then
echo "DHCP still running ($pid), waiting" >&2
- wait "$pid"
+ while [[ -e /proc/$pid ]]; do
+ sleep 1
+ done
fi
echo "Stopping DHCP processing" >&2
systemctl stop --no-block gbmc-br-dhcp