aboutsummaryrefslogtreecommitdiff
path: root/board-js2x
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2017-04-26 07:15:25 +0200
committerAlexey Kardashevskiy <aik@ozlabs.ru>2017-04-26 15:42:19 +1000
commit06e1e07e5f329dcb2441bc778e13af7825603c62 (patch)
treea5e6f2292c894510587b877f3f4abe47c763596d /board-js2x
parent15572e4d646758ad75d69526d096c380fe3aaf2b (diff)
downloadSLOF-06e1e07e5f329dcb2441bc778e13af7825603c62.zip
SLOF-06e1e07e5f329dcb2441bc778e13af7825603c62.tar.gz
SLOF-06e1e07e5f329dcb2441bc778e13af7825603c62.tar.bz2
Rework the printing of the banner during boot
If the initial boot attempt fails, for example because the file that we downloaded via TFTP is not executable, or because the user exited grub instead of booting a kernel, SLOF prints out the banner text twice. This is quite ugly. Fix it by avoiding to print the banner during the first boot attempt, i.e. by adding the ".banner" command to the "boot" command only after we've done the first attempt via "start-it". Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1443904 Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Diffstat (limited to 'board-js2x')
-rw-r--r--board-js2x/slof/OF.fs6
1 files changed, 6 insertions, 0 deletions
diff --git a/board-js2x/slof/OF.fs b/board-js2x/slof/OF.fs
index f342d2f..f8cde85 100644
--- a/board-js2x/slof/OF.fs
+++ b/board-js2x/slof/OF.fs
@@ -541,6 +541,12 @@ cr
\ this CATCH is to ensure the code bellow always executes: boot may ABORT!
' start-it CATCH drop
+: boot
+ boot
+ \ When we return from boot print the banner again.
+ .banner
+;
+
#include <history.fs>
nvram-history? [IF]
." loading shell history .. "