From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Date: Mon, 25 Feb 2019 02:47:03 +0000 (+1100)
Subject: utils/pb-console: Trap SIGTERM on boot
X-Git-Tag: v1.10.2^0
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=5c726bd40a4a745e115a22e336131be8f6666b55;ds=inline

utils/pb-console: Trap SIGTERM on boot

On kexec all processes will be sent a SIGTERM and SIGKILL. By default
there are messages on the console alerting the user to this, however in
some implementations these messages are disabled. This can have the
effect of the UI seemingly exiting to the shell on boot and hanging for
a short while before the kexec actually jumps into the next kernel.
Trap the SIGTERM sent to the pb-console parent process and print a short
message to the screen instead of momentarily dropping to the shell and
printing the usual help messages.

While here also cleanup the shell help messages below which are now
handled in the shell's .shrc file.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---

diff --git a/utils/pb-console b/utils/pb-console
index ad601e2..5ba98cc 100644
--- a/utils/pb-console
+++ b/utils/pb-console
@@ -135,12 +135,11 @@ fi
 dmesg -n 1
 
 trap '' SIGINT
+trap 'reset; echo "SIGTERM received, booting..."; sleep 2' SIGTERM
 
 while :
 do
 	$ui $verbose_opt
 	reset
-	echo "Exiting petitboot. Type 'exit' to return."
-	echo "You may run 'pb-sos' to gather diagnostic data"
 	$shell
 done