diff options
| author |   khilman <khilman@users.noreply.github.com> | 2018-01-24 08:58:57 -0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-01-24 08:58:57 -0800 |
| commit | f14d69b382978069321acdec9a434ca85ac137da (patch) | |
| tree | 90cdd4df15614ffe022778f986d551a63959712e /lava-master/scripts/setup.sh | |
| parent | 736fc3248108069d9f7d98fadc436aad3732dfab (diff) | |
| parent | c856c35e30f4465f8d14834d672a0dcbf06567fb (diff) | |
Merge pull request #13 from montjoie/bugfix
Bugfix
Diffstat (limited to 'lava-master/scripts/setup.sh')
| -rwxr-xr-x | lava-master/scripts/setup.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lava-master/scripts/setup.sh b/lava-master/scripts/setup.sh index 011a9c7..b60c93b 100755 --- a/lava-master/scripts/setup.sh +++ b/lava-master/scripts/setup.sh @@ -43,11 +43,12 @@ fi # This directory is used for storing device-types already added mkdir -p /root/.lavadocker/ if [ -e /root/device-types ];then - for i in $(ls /root/device-types/*yaml) + for i in $(ls /root/device-types/*jinja2) do - cp /root/device-types/$i /etc/lava-server/dispatcher-config/device-types/ - devicetype=$(basename $i) - lava-server manage device-types add $devicetype || exit 1 + cp $i /etc/lava-server/dispatcher-config/device-types/ + devicetype=$(basename $i |sed 's,.jinja2,,') + echo "Adding custom $devicetype" + lava-server manage device-types add $devicetype || exit $? touch /root/.lavadocker/devicetype-$devicetype done fi |