aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorswedebugia <swedebugia@riseup.net>2018-12-14 19:41:41 +0100
committerLudovic Courtès <ludo@gnu.org>2018-12-18 16:04:25 +0100
commitbd5a81f9b8eafc4721d64a53738e4da06eac2fa0 (patch)
tree4e1b3b71afd46f1bfa1b8acebb03a601b4a4deb6
parent4d55431d89f0209d764af811fc1ed0e48335ee39 (diff)
downloadguix-bd5a81f9b8eafc4721d64a53738e4da06eac2fa0.tar
guix-bd5a81f9b8eafc4721d64a53738e4da06eac2fa0.tar.gz
guix system: Clarify the three strategies available.
* guix/scripts/system.scm (show-help): Clarify the three choices. * doc/guix.texi (Invoking guix system): Add 3 @cindex to make on-error=strategy easier to find. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--doc/guix.texi3
-rw-r--r--guix/scripts/system.scm3
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 8fb4bf1a45..8611b61026 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -22953,6 +22953,9 @@ appear in the @code{operating-system} declaration actually exist
needed at boot time are listed in @code{initrd-modules} (@pxref{Initial
RAM Disk}). Passing this option skips these tests altogether.
+@cindex on-error
+@cindex on-error strategy
+@cindex error strategy
@item --on-error=@var{strategy}
Apply @var{strategy} when an error occurs when reading @var{file}.
@var{strategy} may be one of the following:
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 8eb32c62bc..6cda3ccbd6 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -993,7 +993,8 @@ Some ACTIONS support additional ARGS.\n"))
instead of reading FILE, when applicable"))
(display (G_ "
--on-error=STRATEGY
- apply STRATEGY when an error occurs while reading FILE"))
+ apply STRATEGY (one of nothing-special, backtrace,
+ or debug) when an error occurs while reading FILE"))
(display (G_ "
--file-system-type=TYPE
for 'disk-image', produce a root file system of TYPE