From 33a4006529ca0e463f1e1fc95daef973a6facd3f Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 1 Aug 2016 19:32:53 +0100 Subject: bitbake: 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. (Bitbake rev: 7d14ca8cbabbb893e507a66e4cc6e3e77c1e8c84) Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/bin/toaster | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bitbake/bin/toaster') diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 79ab301de8..80d07ab0c8 100755 --- a/bitbake/bin/toaster +++ b/bitbake/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 -- cgit v1.2.3-54-g00ecf