Skip to content

W
White Rabbit Switch - Software
Commit c97eab53 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

userspace/rootfs_override: remove waiting for wrsw_hal to be ready in start-daemons.sh.in 

Since rtud and rtu_stat wait internally for hal and rtud shmem to be available,
there is no need to check that in startup script. For the same reason we can
remove "sleep 4" before calling rtu_stat.

Also there is no need to check whether ppsi binary is available. Such situation
will be reported in different ways.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 92ab4c1f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 15 deletions
userspace/rootfs_override/wr/sbin/start-daemons.sh.in
View file @ c97eab53
......@@ -28,21 +28,8 @@ export WR_HOME="/wr"
eval $WR_HOME/bin/wrsw_hal $LOGPIPE_HAL \&
eval $WR_HOME/bin/wrsw_rtud $LOGPIPE_RTU \&
if [ ! -x $WR_HOME/bin/ppsi ]; then
echo "No WR-PTP daemon found" >&2
exit 1
fi
# Fire ppsi. Unfortinately the hal takes a while to start, and
# until ppsi waits by itself (not in this submodule commit, yet),
# wait here... This is the last script of the wr startup, and it can wait
for i in $(seq 1 10); do
if [ -S /tmp/.minipc/wrsw_hal ]; then break; fi
sleep 1
done
eval $WR_HOME/bin/ppsi $LOGPIPE_PTP \&
eval $WR_HOME/bin/ppsi $LOGPIPE_PTP \&
# ensure we receive UDP PTP frames, since ppsi supports UDP too.
(sleep 4; $WR_HOME/bin/rtu_stat add 01:00:5e:00:01:81 18 0) &
$WR_HOME/bin/rtu_stat add 01:00:5e:00:01:81 18 0 &
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment