From 18fca4fa723fb6f2a6b1a9a65c8a0fd9264c0f3a Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 3 Jul 2018 12:10:30 -0400 Subject: [PATCH] tools: kwboot: unbreak terminal-only mode Commit 84899e2 ("tools/kwboot: Sync with latest barebox version to support Armada XP") accidently broke the terminal-only mode (-t) by removing the test on the bootmsg. Thus even when trying to use kwboot as a plain terminal, it asks to reboot the target. This commit simply reintroduces the lost test so that it is possible again to use kwboot to attach to the target system's console. Signed-off-by: Willy Tarreau Signed-off-by: Stefan Roese --- tools/kwboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/kwboot.c b/tools/kwboot.c index 8a421cda4e..0a77060288 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -821,7 +821,7 @@ main(int argc, char **argv) perror("debugmsg"); goto out; } - } else { + } else if (bootmsg) { rc = kwboot_bootmsg(tty, bootmsg); if (rc) { perror("bootmsg"); -- 2.39.5