summaryrefslogtreecommitdiffstats
path: root/lava-master/scripts/start.sh
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-07-02 15:03:50 +0200
committerCorentin LABBE <clabbe@baylibre.com>2018-07-12 14:30:20 +0200
commit3e0ed7a2bb5f52ba54fdc1a6fbbe258f42397fbe (patch)
tree51edc1b51822ef42cf69dcc975a093bdef67638c /lava-master/scripts/start.sh
parenta86807eafd93f0f53933929f616ee3a73d807d7c (diff)
Add device-types and tokens at startup
This patch remove the use of setup.sh during build. So setup.sh is now ran during startup. Since setup.sh could ran multiple times (start -> stop -> start) against the same database, we need to handle already existing objects (user, devices,...) So all "add objects" are done only after a check that this object is not already present.
Diffstat (limited to 'lava-master/scripts/start.sh')
-rwxr-xr-xlava-master/scripts/start.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/lava-master/scripts/start.sh b/lava-master/scripts/start.sh
index 0e223b5..c34fe34 100755
--- a/lava-master/scripts/start.sh
+++ b/lava-master/scripts/start.sh
@@ -25,6 +25,9 @@ start () {
rm -f /var/run/lava-*.pid 2> /dev/null
/etc/init.d/postgresql start
+
+/setup.sh || exit $?
+
start apache2 || exit $?
start lava-logs || exit $?
start lava-master || exit $?