summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-08-01 19:32:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-11 00:08:17 +0100
commit7d14ca8cbabbb893e507a66e4cc6e3e77c1e8c84 (patch)
tree408141dcc72add58253fee32b7d340ae253fd3e5 /bin
parentd2f4ffbf061e874a7731441f8346fdc568e9f07f (diff)
downloadbitbake-contrib-7d14ca8cbabbb893e507a66e4cc6e3e77c1e8c84.tar.gz
bitbake-contrib-7d14ca8cbabbb893e507a66e4cc6e3e77c1e8c84.tar.bz2
bitbake-contrib-7d14ca8cbabbb893e507a66e4cc6e3e77c1e8c84.zip
toaster: checksettings call django's loaddata instead of custom command
Call django's inbuilt loaddata command to load the appropriate fixtures. We also attempt to load a fixture called "custom" and fail silently if we don't have one. This is where initial customisations can be done to load particular settings or data into Toaster (for example layers or default values for variables) Make sure the value for TEMPLATECONF is available to checksettings so that we can have a go a working out which default data to load. Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/toaster3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/toaster b/bin/toaster
index 79ab301de8..80d07ab0c8 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -59,7 +59,8 @@ webserverStartAll()
echo "Failed migrations, aborting system start" 1>&2
return $retval
fi
-
+ # Make sure that checksettings can pick up any value for TEMPLATECONF
+ export TEMPLATECONF
$MANAGE checksettings --traceback || retval=1
if [ $retval -eq 1 ]; then