summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksij Rempel <o.rempel@pengutronix.de>2018-06-06 07:46:51 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2018-06-07 09:46:01 +0200
commit2b8c3fe861019a0ea67db23bfde82a22400c2b61 (patch)
tree1dfb1c1c06c8bcdc590f33f42a4c743b4a3bfced
parent8a898254168f895e79cae9dc23eada349fd5545c (diff)
downloadbarebox-2b8c3fe861019a0ea67db23bfde82a22400c2b61.tar.gz
defaultenv-2: make abort key to stop autoboot configurable
currently supported only two options: any key and ctrl-c "any key" is default option. To configure it, use: nv autoboot_abort_key=any or nv autoboot_abort_key=ctrl-c Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--Documentation/user/defaultenv-2.rst3
-rw-r--r--defaultenv/defaultenv-2-base/bin/init17
2 files changed, 17 insertions, 3 deletions
diff --git a/Documentation/user/defaultenv-2.rst b/Documentation/user/defaultenv-2.rst
index db74176..7502d3d 100644
--- a/Documentation/user/defaultenv-2.rst
+++ b/Documentation/user/defaultenv-2.rst
@@ -93,6 +93,9 @@ the :ref:`command_edit` command. Typical content:
# timeout in seconds before the default boot entry is started
#global.autoboot_timeout=3
+ # key to abort autoboot. Supported options are: "any" and "ctrl-c"
+ #global.autoboot_abort_key=any
+
# list of boot entries. These are executed in order until one
# succeeds. An entry can be:
# - a filename in /env/boot/
diff --git a/defaultenv/defaultenv-2-base/bin/init b/defaultenv/defaultenv-2-base/bin/init
index 6f3a34d..8d02e3d 100644
--- a/defaultenv/defaultenv-2-base/bin/init
+++ b/defaultenv/defaultenv-2-base/bin/init
@@ -5,6 +5,7 @@ export PATH=/env/bin
global hostname
global user
global autoboot_timeout
+global autoboot_abort_key
global boot.default
global linux.bootargs.base
global linux.bootargs.console
@@ -18,6 +19,8 @@ global editcmd
magicvar -a global.user "username (used in network filenames)"
[ -z "${global.autoboot_timeout}" ] && global.autoboot_timeout=3
magicvar -a global.autoboot_timeout "timeout in seconds before automatic booting"
+[ -z "${global.autoboot_abort_key}" ] && global.autoboot_abort_key=any
+magicvar -a global.autoboot_abort_key "key to abort automatic booting (valid options: any, ctrl-c)"
[ -z "${global.boot.default}" ] && global.boot.default=net
[ -z "${global.editcmd}" ] && global.editcmd=sedit
@@ -38,14 +41,22 @@ for i in /env/init/*; do
. $i
done
+if [ "${global.autoboot_abort_key}" = "ctrl-c" ]; then
+ abort_string="ctrl-c"
+ abort_args="-c"
+else
+ abort_string="any key"
+ abort_args="-a"
+fi
+
if [ -e /env/menu ]; then
- echo -e -n "\nHit m for menu or any other key to stop autoboot: "
+ echo -e -n "\nHit m for menu or $abort_string to stop autoboot: "
else
- echo -e -n "\nHit any key to stop autoboot: "
+ echo -e -n "\nHit $abort_string to stop autoboot: "
fi
if [ "$autoboot" = 0 ]; then
- timeout -a $global.autoboot_timeout -v key
+ timeout $abort_args $global.autoboot_timeout -v key
autoboot="$?"
fi