summaryrefslogtreecommitdiffstats
path: root/commands
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-03-13 08:16:44 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-03-13 08:16:44 +0100
commite0093dcf236cdc1d4faef95189c9376ef6610ae7 (patch)
treead41b7daf6e194ad32b0b6a7b33e652c45bd9d38 /commands
parent4e11672653a4ad639ca2d2158b1266b258951f93 (diff)
parent939d3a7684ed3138f5e2bfff7cd2876c1e050ca8 (diff)
downloadbarebox-e0093dcf236cdc1d4faef95189c9376ef6610ae7.tar.gz
barebox-e0093dcf236cdc1d4faef95189c9376ef6610ae7.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'commands')
-rw-r--r--commands/timeout.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/commands/timeout.c b/commands/timeout.c
index ef1a037c19..d197cedd8b 100644
--- a/commands/timeout.c
+++ b/commands/timeout.c
@@ -32,7 +32,7 @@ static int do_timeout(int argc, char *argv[])
char str[2] = { };
const char *varname = NULL;
- while((opt = getopt(argc, argv, "crsav:")) > 0) {
+ while ((opt = getopt(argc, argv, "crsav:e")) > 0) {
switch(opt) {
case 'r':
flags |= CONSOLE_COUNTDOWN_RETURN;
@@ -46,6 +46,9 @@ static int do_timeout(int argc, char *argv[])
case 's':
flags |= CONSOLE_COUNTDOWN_SILENT;
break;
+ case 'e':
+ flags |= CONSOLE_COUNTDOWN_EXTERN;
+ break;
case 'v':
varname = optarg;
break;
@@ -73,6 +76,7 @@ BAREBOX_CMD_HELP_TEXT("Options:")
BAREBOX_CMD_HELP_OPT("-a", "interrupt on any key")
BAREBOX_CMD_HELP_OPT("-c", "interrupt on Ctrl-C")
BAREBOX_CMD_HELP_OPT("-r", "interrupt on RETURN")
+BAREBOX_CMD_HELP_OPT("-e", "interrupt on external commands (i.e. fastboot")
BAREBOX_CMD_HELP_OPT("-s", "silent mode")
BAREBOX_CMD_HELP_OPT("-v <VARIABLE>", "export pressed key to environment")
BAREBOX_CMD_HELP_END
@@ -80,7 +84,7 @@ BAREBOX_CMD_HELP_END
BAREBOX_CMD_START(timeout)
.cmd = do_timeout,
BAREBOX_CMD_DESC("wait for a specified timeout")
- BAREBOX_CMD_OPTS("[-acrsv] SECONDS")
+ BAREBOX_CMD_OPTS("[-acrsev] SECONDS")
BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE)
BAREBOX_CMD_HELP(cmd_timeout_help)
BAREBOX_CMD_END