diff options
author | Holger Schurig <holgerschurig@gmail.com> | 2014-05-13 10:28:42 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-14 10:03:43 +0200 |
commit | f1f532084a6e9ee8225f047353999b459455df7e (patch) | |
tree | f2b8b1f25c5c630209c6970e3a7ce57a3d55d367 /commands/boot.c | |
parent | ab23d0bb3f66cfb7a97a8aa6b8007687ed7a6925 (diff) | |
download | barebox-f1f532084a6e9ee8225f047353999b459455df7e.tar.gz barebox-f1f532084a6e9ee8225f047353999b459455df7e.tar.xz |
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/boot.c')
-rw-r--r-- | commands/boot.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/commands/boot.c b/commands/boot.c index 12be5de425..a4dc6d76f7 100644 --- a/commands/boot.c +++ b/commands/boot.c @@ -456,30 +456,34 @@ out: } BAREBOX_CMD_HELP_START(boot) -BAREBOX_CMD_HELP_USAGE("boot [OPTIONS] [BOOTSRC...]\n") -BAREBOX_CMD_HELP_SHORT("Boot an operating system.\n") -BAREBOX_CMD_HELP_SHORT("[BOOTSRC...] can be:\n") -BAREBOX_CMD_HELP_SHORT("- a filename under /env/boot/\n") -BAREBOX_CMD_HELP_SHORT("- a full path to a boot script\n") -BAREBOX_CMD_HELP_SHORT("- a device name\n") -BAREBOX_CMD_HELP_SHORT("- a partition name under /dev/\n") -BAREBOX_CMD_HELP_SHORT("- a full path to a directory which\n") -BAREBOX_CMD_HELP_SHORT(" - contains boot scripts, or\n") -BAREBOX_CMD_HELP_SHORT(" - contains a loader/entries/ directory containing bootspec entries\n") -BAREBOX_CMD_HELP_SHORT("\n") -BAREBOX_CMD_HELP_SHORT("Multiple bootsources may be given which are probed in order until\n") -BAREBOX_CMD_HELP_SHORT("one succeeds.\n") -BAREBOX_CMD_HELP_SHORT("\nOptions:\n") -BAREBOX_CMD_HELP_OPT ("-v","Increase verbosity\n") -BAREBOX_CMD_HELP_OPT ("-d","Dryrun. See what happens but do no actually boot\n") -BAREBOX_CMD_HELP_OPT ("-l","List available boot sources\n") -BAREBOX_CMD_HELP_OPT ("-m","Show a menu with boot options\n") -BAREBOX_CMD_HELP_OPT ("-t <timeout>","specify timeout for the menu\n") +BAREBOX_CMD_HELP_TEXT("This is for booting based on scripts. Unlike the bootm command which") +BAREBOX_CMD_HELP_TEXT("can boot a single image this command offers the possibility to boot with") +BAREBOX_CMD_HELP_TEXT("scripts (by default placed under /env/boot/).") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("BOOTSRC can be:") +BAREBOX_CMD_HELP_TEXT("- a filename under /env/boot/") +BAREBOX_CMD_HELP_TEXT("- a full path to a boot script") +BAREBOX_CMD_HELP_TEXT("- a device name") +BAREBOX_CMD_HELP_TEXT("- a partition name under /dev/") +BAREBOX_CMD_HELP_TEXT("- a full path to a directory which") +BAREBOX_CMD_HELP_TEXT(" - contains boot scripts, or") +BAREBOX_CMD_HELP_TEXT(" - contains a loader/entries/ directory containing bootspec entries") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Multiple bootsources may be given which are probed in order until") +BAREBOX_CMD_HELP_TEXT("one succeeds.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-v","Increase verbosity") +BAREBOX_CMD_HELP_OPT ("-d","Dryrun. See what happens but do no actually boot") +BAREBOX_CMD_HELP_OPT ("-l","List available boot sources") +BAREBOX_CMD_HELP_OPT ("-m","Show a menu with boot options") +BAREBOX_CMD_HELP_OPT ("-t SECS","specify timeout in SECS") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(boot) .cmd = do_boot, - .usage = "boot the machine", + BAREBOX_CMD_DESC("boot from script, device, ...") + BAREBOX_CMD_OPTS("[-vdlmt] [BOOTSRC...]") BAREBOX_CMD_GROUP(CMD_GRP_BOOT) BAREBOX_CMD_HELP(cmd_boot_help) BAREBOX_CMD_END |