From 277552fb20a1b9919d9600390f96ecd1c71d44e8 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 7 Mar 2018 10:44:52 +0100 Subject: Reorder start of slave services Starting lava-slave too early is dangerous since some services it needs are not started yet. Always start lava-slave in last. --- lava-slave/scripts/start.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lava-slave') diff --git a/lava-slave/scripts/start.sh b/lava-slave/scripts/start.sh index ec94aee..92e76bb 100755 --- a/lava-slave/scripts/start.sh +++ b/lava-slave/scripts/start.sh @@ -6,10 +6,6 @@ fi service tftpd-hpa start || exit 4 -# FIXME lava-slave does not run if old pid is present -rm -f /var/run/lava-slave.pid -service lava-slave start || exit 5 - touch /var/run/conmux-registry /usr/sbin/conmux-registry 63000 /var/run/conmux-registry& sleep 2 @@ -22,4 +18,10 @@ do done # start an http file server for boot/transfer_overlay support -(cd /var/lib/lava/dispatcher; python -m SimpleHTTPServer 80) +(cd /var/lib/lava/dispatcher; python -m SimpleHTTPServer 80) & + +# FIXME lava-slave does not run if old pid is present +rm -f /var/run/lava-slave.pid +service lava-slave start || exit 5 + +sleep 3650d -- cgit 1.2.3-korg