summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-03-07 10:44:52 +0100
committerCorentin LABBE <clabbe@baylibre.com>2018-03-08 20:07:14 +0100
commit277552fb20a1b9919d9600390f96ecd1c71d44e8 (patch)
treeff35085d8812b64eb71bd38346563ed3329894e6
parent32ad2b81fcd4ac8980a7ebbc2eb583314c3c569f (diff)
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.
-rwxr-xr-xlava-slave/scripts/start.sh12
1 files changed, 7 insertions, 5 deletions
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