osmith submitted this change.

View Change

Approvals: osmith: Looks good to me, approved; Verified
net: run.sh: fix infinite "q Enter to close" msgs

Fix the logic that is supposed to display a "q Enter to close" message
once and wait for user input, in case one of the Osmocom programs
crashed.

Explicitly read from /dev/tty, as it may not be connected as default
stdin anymore at this point. This happens when using the new code paths
with tmux as terminal, but also happened before recent refactorings for
me with all terminals.

Related: https://media.ccc.de/v/osmodevcall-20211210-osmith-osmo-dev-ttcn3#t=801
Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b
---
M net/templates/run.sh
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/templates/run.sh b/net/templates/run.sh
index 1d78db5..64419a6 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -118,7 +118,7 @@

while true; do
echo 'q Enter to close'
- read q_to_close
+ read q_to_close < /dev/tty
if [ "x\$q_to_close" = xq ]; then
break
fi

To view, visit change 27037. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: Iebb799493f76fd57f24b15c998ded2bd8e284e6b
Gerrit-Change-Number: 27037
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-CC: neels <nhofmeyr@sysmocom.de>
Gerrit-MessageType: merged