guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/06: guix system: Clarify the three strategies available.


From: guix-commits
Subject: 03/06: guix system: Clarify the three strategies available.
Date: Tue, 18 Dec 2018 10:04:36 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit bd5a81f9b8eafc4721d64a53738e4da06eac2fa0
Author: swedebugia <address@hidden>
Date:   Fri Dec 14 19:41:41 2018 +0100

    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 <address@hidden>
---
 doc/guix.texi           | 3 +++
 guix/scripts/system.scm | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 8fb4bf1..8611b61 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.
 
address@hidden on-error
address@hidden on-error strategy
address@hidden error strategy
 @item address@hidden
 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 8eb32c6..6cda3cc 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]