diff options
| author |   khilman <khilman@users.noreply.github.com> | 2019-04-07 20:35:55 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-04-07 20:35:55 -0700 |
| commit | 6d2fb57fdaf6bed78b131f7c6b4aed71d55630c7 (patch) | |
| tree | bd12f4a94330cbd3c75faa952b687b6a10e2bc5a /lava-master/scripts/setup.sh | |
| parent | 31d0a888ee944ac0f8c0418dff942adfde448ca7 (diff) | |
| parent | 14e3c762e575d8742b39799018913e7d944111b6 (diff) | |
Merge pull request #86 from montjoie/support_2019.03
Support 2019.03
Diffstat (limited to 'lava-master/scripts/setup.sh')
| -rwxr-xr-x | lava-master/scripts/setup.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lava-master/scripts/setup.sh b/lava-master/scripts/setup.sh index c22a06f..489dd51 100755 --- a/lava-master/scripts/setup.sh +++ b/lava-master/scripts/setup.sh @@ -151,6 +151,10 @@ mkdir -p /root/.lavadocker/ if [ -e /root/device-types ];then for i in $(ls /root/device-types/*jinja2) do + if [ -e /etc/lava-server/dispatcher-config/device-types/$(basename $i) ];then + echo "WARNING: overwriting device-type $i" + diff -u "/etc/lava-server/dispatcher-config/device-types/$(basename $i)" $i + fi cp $i /etc/lava-server/dispatcher-config/device-types/ devicetype=$(basename $i |sed 's,.jinja2,,') lava-server manage device-types list | grep -q "[[:space:]]$devicetype[[:space:]]" |