diff options
| author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-01-08 13:15:12 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-08 22:34:36 +0000 |
| commit | 3e73af423fa55da10073add2503fb1ef361e1956 (patch) | |
| tree | cd2f528217425c3e078e6dcaa681de75ef8614ae | |
| parent | 3c3766927212853dfd195185caaa0fc951f049c8 (diff) | |
| download | ast2050-yocto-poky-3e73af423fa55da10073add2503fb1ef361e1956.zip ast2050-yocto-poky-3e73af423fa55da10073add2503fb1ef361e1956.tar.gz | |
bitbake: toaster: do not launch web browser on noweb option
This patch makes Toaster managed mode obey the "noweb" parameter
by not starting the web server and launching the web browser
command if the "noweb" parameter is specified.
The web browser will be pointed at 127.0.0.1 instead of 0.0.0.0
[YOCTO #7039]
(Bitbake rev: 4037f8b08bc9fb5c4c9f260efb847105be718a32)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | bitbake/bin/toaster | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 6969bf7..a6d2e92 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -185,11 +185,14 @@ if [ -z "$ZSH_NAME" ] && [ `basename \"$0\"` = `basename \"$BASH_SOURCE\"` ]; th } TOASTER_MANAGED=1 export TOASTER_MANAGED=1 - if ! webserverStartAll; then + if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then echo "Failed to start the web server, stopping" 1>&2; exit 1; fi - xdg-open http://0.0.0.0:$WEB_PORT/ >/dev/null 2>&1 & + if [ $WEBSERVER -gt 0 ]; then + echo "Starting browser..." + xdg-open http://127.0.0.1:$WEB_PORT/ >/dev/null 2>&1 & + fi trap trap_ctrlc SIGINT echo "Running. Stop with Ctrl-C" while [ $RUNNING -gt 0 ]; do |
