summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbitbake/bin/toaster5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index d7c5a845e4..cf93e9fd98 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -176,6 +176,8 @@ else
176 TOASTER=$0 176 TOASTER=$0
177fi 177fi
178 178
179[ `basename \"$0\"` = `basename \"${TOASTER}\"` ] && TOASTER_MANAGED=1
180
179BBBASEDIR=`dirname $TOASTER`/.. 181BBBASEDIR=`dirname $TOASTER`/..
180 182
181RUNNING=0 183RUNNING=0
@@ -232,7 +234,7 @@ for param in $*; do
232 esac 234 esac
233done 235done
234 236
235if [ `basename \"$0\"` = `basename \"${TOASTER}\"` ]; then 237if [ "$TOASTER_MANAGED" = '1' ]; then
236 # We are called as standalone. We refuse to run in a build environment - we need the interactive mode for that. 238 # We are called as standalone. We refuse to run in a build environment - we need the interactive mode for that.
237 # Start just the web server, point the web browser to the interface, and start any Django services. 239 # Start just the web server, point the web browser to the interface, and start any Django services.
238 240
@@ -279,7 +281,6 @@ if [ `basename \"$0\"` = `basename \"${TOASTER}\"` ]; then
279 do_cleanup 281 do_cleanup
280 fi 282 fi
281 } 283 }
282 TOASTER_MANAGED=1
283 export TOASTER_MANAGED=1 284 export TOASTER_MANAGED=1
284 if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then 285 if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
285 echo "Failed to start the web server, stopping" 1>&2 286 echo "Failed to start the web server, stopping" 1>&2