X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemctl.xml;h=e3d22a7b5bf000281d7e849c10182b144b51a405;hb=b4efdf97203ddf781c17f77be84cc61516a077d2;hp=167a72b58b47b5aa40babb27d09b15cddb0f0033;hpb=19c5f19d69bb5f520fa7213239490c55de06d99d;p=elogind.git
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 167a72b58..e3d22a7b5 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -8,16 +8,16 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -200,17 +200,17 @@
- Do not print a legend, i.e.
+ Do not print a legend, i.e.
the column headers and the footer with hints.
-
-
+
+
- Do not pipe output into a
- pager.
-
+ Do not pipe output into a
+ pager.
+
@@ -299,11 +299,13 @@
systemctl will
query the user on the terminal for the
necessary secrets. Use this option to
- switch this behavior off. In this
- case the password must be supplied by
- some other means (for example
- graphical password agents) or the
- service might fail.
+ switch this behavior off. In this case
+ the password must be supplied by some
+ other means (for example graphical
+ password agents) or the service might
+ fail. This also disables querying the
+ user for authentication for privileged
+ operations.
@@ -341,7 +343,7 @@
When used with
- enable, override any
+ enable, overwrite any
existing conflicting
symlinks.
@@ -630,7 +632,15 @@
looking for formatted human-readable
output.
+
+ help [NAME...|PID...]
+ Show manual pages for
+ one or more units, if available. If a
+ PID is passed the manual pages for the
+ unit the process of the PID belongs to
+ is shown.
+ reset-failed [NAME...]
@@ -752,7 +762,7 @@
command does not implicitly stop the
units that is being disabled. If this
is desired an additional
- stopcommand should
+ stop command should
be executed afterwards.
This command will print the
@@ -804,12 +814,19 @@
Reset one or more unit
files, as specified on the command
- line, to the defaults configured in a
- preset file. This has the same effect
- as disable or
+ line, to the defaults configured in
+ the preset policy files. This has the
+ same effect as
+ disable or
enable, depending
how the unit is listed in the preset
- files.
+ files. For more information on preset
+ policy format see
+ systemd.preset5. For
+ more information on the concept of
+ presets please consult the Preset
+ document.
@@ -1147,6 +1164,43 @@
option) and
will fail otherwise.
+
+ suspend
+
+ Suspend the system.
+
+
+ hibernate
+
+ Hibernate the system.
+
+
+ switch-root [ROOT] [INIT]
+
+ Switches to a
+ different root directory and executes
+ a new system manager process below
+ it. This is intended for usage in
+ initial RAM disks ("initrd"), and will
+ transition from the initrd's system
+ manager process (a.k.a "init" process)
+ to the main system manager
+ process. Takes two arguments: the
+ directory to make the new root
+ directory, and the path to the new
+ system manager binary below it to
+ execute as PID 1. If the latter is
+ ommitted or the empty string, a
+ systemd binary will automatically be
+ searched for and used as init. If the
+ system manager path is ommitted or
+ equal the empty string the state of
+ the initrd's system manager process is
+ passed to the main system manager,
+ which allows later introspection of the
+ state of the services involved in the
+ initrd boot.
+
@@ -1183,7 +1237,8 @@
loginctl1,
systemd.unit5,
systemd.special7,
- wall1
+ wall1,
+ systemd.preset5