diff options
| author | Matthew Miller <mattdm@mattdm.org> | 2010-08-31 00:17:56 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-31 00:17:56 +0200 |
| commit | 74ac3cbd509de2f5995542aa5db39328e8cbd22a (patch) | |
| tree | 9836d146be88e690d0680c1629b1674736b6258b /man | |
| parent | c88e7f4e57fcef7998dcd570e8a8866c5116f0de (diff) | |
manager: rename 'maintenance' state to 'failed' to avoid user confusion
https://bugzilla.redhat.com/show_bug.cgi?id=614619
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemctl.xml | 25 | ||||
| -rw-r--r-- | man/systemd.unit.xml | 30 | ||||
| -rw-r--r-- | man/systemd.xml | 2 |
3 files changed, 30 insertions, 27 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index 6af8e61d06..466d990dbd 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -399,18 +399,19 @@ </varlistentry> <varlistentry> - <term><command>reset-maintenance [NAME...]</command></term> - - <listitem><para>Reset maintenance - state of the specified units, or if no - unit name is passed of all units. When - a unit fails in some way (i.e. process - exiting with non-zero error code, - terminating abnormally or timing out) - it will automatically enter - maintenance state and its exit codes - and status is recorded for - introspection by the administrator + <term><command>reset-failed [NAME...]</command></term> + + <listitem><para>Reset the + '<literal>failed</literal>' state of the + specified units, or if no unit name is + passed of all units. When a unit fails + in some way (i.e. process exiting with + non-zero error code, terminating + abnormally or timing out) it will + automatically enter the + '<literal>failed</literal>' state and + its exit code and status is recorded + for introspection by the administrator until the service is restarted or reset with this command.</para></listitem> diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 250989fe0f..3bc5d3c66f 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -418,8 +418,9 @@ <listitem><para>Lists one or more units that are activated when this - unit fails (i.e. enters maintenance - state).</para></listitem> + unit enters the + '<literal>failed</literal>' + state.</para></listitem> </varlistentry> <varlistentry> @@ -552,22 +553,23 @@ time. If this time limit is reached the job will be cancelled, the unit however will not change state or even - enter maintenance mode. This value - defaults to 0 (job timeouts disabled), - except for device units. NB: this - timeout is independent from any - unit-specific timeout (for example, - the timeout set with + enter the '<literal>failed</literal>' + mode. This value defaults to 0 (job + timeouts disabled), except for device + units. NB: this timeout is independent + from any unit-specific timeout (for + example, the timeout set with <varname>Timeout=</varname> in service - units) as the job timeout has no effect - on the unit itself, only on the job - that might be pending for it. Or in - other words: unit-specific timeouts + units) as the job timeout has no + effect on the unit itself, only on the + job that might be pending for it. Or + in other words: unit-specific timeouts are useful to abort unit state changes, and revert them. The job timeout set with this option however - is useful to abort only the job waiting - for the unit state to change.</para></listitem> + is useful to abort only the job + waiting for the unit state to + change.</para></listitem> </varlistentry> </variablelist> diff --git a/man/systemd.xml b/man/systemd.xml index edd824d31d..428e17f63b 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -256,7 +256,7 @@ as well as in the process of being activated or deactivated, i.e. between the two states (these states are called 'activating', 'deactivating'). A special - 'maintenance' state is available as well which is very + 'failed' state is available as well which is very similar to 'inactive' and is entered when the service failed in some way (process returned error code on exit, or crashed, or an operation timed out). If this |