X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemctl.xml;h=786c2bdfcfa40df7cf264d660d00a830dbc364aa;hp=25b9266d49e560dc3dfbe0455183198c2d1b259c;hb=6524990fdc98370ecba5d9f73e67161e8798c010;hpb=0aed10889b42ac3adc1954eb07c8653784f46e58
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 25b9266d4..786c2bdfc 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 .
-->
@@ -44,7 +44,6 @@
systemctl
- systemd-systemctlControl the systemd system and service manager
@@ -88,14 +87,26 @@
- When listing units,
- limit display to certain unit
- types. If not specified units of all
- types will be shown. The argument
- should be a unit type name such as
- ,
- and
- similar.
+ The argument should
+ be a unit type name such as
+ and
+ ,
+ or a unit load state such as
+ and
+ .
+
+
+ If the argument is a unit type,
+ when listing units, limit display to
+ certain unit types. If not specified
+ units of all types will be shown.
+
+ If the argument is a unit load state,
+ when listing units, limit display to
+ certain unit types. If not specified
+ units of in all load states will be
+ shown.
+
@@ -167,7 +178,7 @@
execute it immediately. If passed no
required units of the unit passed will
be pulled in, and no ordering
- dependencies will be honoured. This is
+ dependencies will be honored. This is
mostly a debugging and rescue tool for
the administrator and should not be
used by
@@ -201,17 +212,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.
+
@@ -300,11 +311,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.
@@ -342,7 +355,7 @@
When used with
- enable, override any
+ enable, overwrite any
existing conflicting
symlinks.
@@ -429,16 +442,6 @@
10.
-
-
-
- When used with
- status continously
- prints new journal entries as they are
- appended to the
- journal.
-
-
@@ -630,7 +633,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...]
@@ -660,24 +671,29 @@
enable [NAME...]
- Enable one or more
- unit files, as specified on the
+ Enable one or
+ more unit files or unit file
+ instances, as specified on the
command line. This will create a
- number of symlinks as encoded in the
- [Install] sections
- of the unit files. After the symlinks
- have been created the systemd
- configuration is reloaded (in a way
- that is equivalent to
- daemon-reload) to
- ensure the changes are taken into
+ number of symlinks as encoded in
+ the [Install]
+ sections of the unit files. After
+ the symlinks have been created the
+ systemd configuration is reloaded
+ (in a way that is equivalent to
+ daemon-reload)
+ to ensure the changes are taken into
account immediately. Note that this
does not have the effect that any of
the units enabled are also started at
- the same time. If this is desired a
- separate start
- command must be invoked for the
- unit.
+ the same time. If this is desired
+ a separate start
+ command must be invoked for the unit.
+ Also note that in case of instance
+ enablement, symlinks named same as
+ instances are created in install
+ location, however they all point to
+ the same template unit file.This command will
print the actions executed. This
@@ -750,9 +766,9 @@
configuration after completing the
disabling of the units. Note that this
command does not implicitly stop the
- units that is being disabled. If this
+ units that are being disabled. If this
is desired an additional
- stopcommand should
+ stop command should
be executed afterwards.This command will print the
@@ -773,7 +789,7 @@
is-enabled [NAME...]Checks whether any of
- the specified unit files is enabled
+ the specified unit files are enabled
(as with
enable). Returns an
exit code of 0 if at least one is
@@ -804,12 +820,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.
@@ -1073,7 +1096,7 @@
mounted read-only, immediately
followed by the system halt. If
is specified
- twice the the operation is immediately
+ twice the operation is immediately
executed without terminating any
processes or unmounting any file
systems. This may result in data
@@ -1094,7 +1117,7 @@
unmounted or mounted read-only,
immediately followed by the powering
off. If is
- specified twice the the operation is
+ specified twice the operation is
immediately executed without
terminating any processes or
unmounting any file systems. This may
@@ -1115,7 +1138,7 @@
unmounted or mounted read-only,
immediately followed by the reboot. If
is specified
- twice the the operation is immediately
+ twice the operation is immediately
executed without terminating any
processes or unmounting any file
systems. This may result in data
@@ -1147,6 +1170,48 @@
option) and
will fail otherwise.
+
+ suspend
+
+ Suspend the system.
+
+
+ hibernate
+
+ Hibernate the system.
+
+
+ hybrid-sleep
+
+ Hibernate and suspend 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
+ omitted or the empty string, a
+ systemd binary will automatically be
+ searched for and used as init. If the
+ system manager path is omitted 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 +1248,8 @@
loginctl1,
systemd.unit5,
systemd.special7,
- wall1
+ wall1,
+ systemd.preset5