X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemctl.xml;h=b5ae48cb44021946d7afdaaf3cce1aaa248e9d30;hb=d03bc1b814b853497120c35a9a8d6a66925963ff;hp=5adee45163b3bcc61c9585ef2fb9878ec24e8290;hpb=263653e10353d8ad155f1faba01981816a2bb712;p=elogind.git
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 5adee4516..b5ae48cb4 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 .
-->
@@ -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.
@@ -349,14 +351,22 @@
halt,
poweroff,
reboot or
- kexec execute
+ kexec execute the
selected operation without shutting
down all units. However, all processes
will be killed forcibly and all file
systems are unmounted or remounted
read-only. This is hence a drastic but
relatively safe option to request an
- immediate reboot.
+ immediate reboot. If
+ is specified
+ twice for these operations, they will
+ be executed immediately without
+ terminating any processes or umounting
+ any file systems. Warning: specifying
+ twice with
+ any of these operations might result
+ in data loss.
@@ -406,6 +416,45 @@
PolicyKit before executing the
operation.
+
+
+
+
+
+ When used with
+ status controls the
+ number of journal lines to show,
+ counting from the most recent
+ ones. Takes a positive integer
+ argument. Defaults to
+ 10.
+
+
+
+
+
+
+ When used with
+ status continously
+ prints new journal entries as they are
+ appended to the
+ journal.
+
+
+
+
+
+
+ When used with
+ status controls the
+ formatting of the journal entries that
+ are shown. For the available choices
+ see
+ journalctl1. Defaults
+ to
+ short.
+
+
The following commands are understood:
@@ -550,14 +599,15 @@
Show terse runtime
status information about one or more
- units. This function is intended to
- generate human-readable output. If you
- are looking for computer-parsable
- output, use show
- instead. If a PID is passed
- information about the unit the process
- of the PID belongs to is
- shown.
+ units, followed by its most recent log
+ data from the journal. This function
+ is intended to generate human-readable
+ output. If you are looking for
+ computer-parsable output, use
+ show instead. If a
+ PID is passed information about the
+ unit the process of the PID belongs to
+ is shown.
show [NAME...|JOB...]
@@ -1017,14 +1067,19 @@
system. This is mostly equivalent to
start halt.target
but also prints a wall message to all
- users. If
- combined with
- shutdown of all running services is
- skipped, however all processes are killed
- and all file systems are unmounted or
+ users. If combined with
+ shutdown of
+ all running services is skipped,
+ however all processes are killed and
+ all file systems are unmounted or
mounted read-only, immediately
- followed by the
- system halt.
+ followed by the system halt. If
+ is specified
+ twice the the operation is immediately
+ executed without terminating any
+ processes or unmounting any file
+ systems. This may result in data
+ loss.
poweroff
@@ -1033,32 +1088,40 @@
power-off the system. This is mostly
equivalent to start
poweroff.target but also
- prints a wall message to all
- users. If
+ prints a wall message to all users. If
combined with
shutdown of all running services is
- skipped, however all processes are killed
- and all file systems are unmounted or
- mounted read-only, immediately
- followed by the
- powering off.
+ skipped, however all processes are
+ killed and all file systems are
+ unmounted or mounted read-only,
+ immediately followed by the powering
+ off. If is
+ specified twice the the operation is
+ immediately executed without
+ terminating any processes or
+ unmounting any file systems. This may
+ result in data loss.
reboot
- Shut down and
- reboot the system. This is mostly
- equivalent to start
+ Shut down and reboot
+ the system. This is mostly equivalent
+ to start
reboot.target but also
- prints a wall message to all
- users. If
+ prints a wall message to all users. If
combined with
shutdown of all running services is
- skipped, however all processes are killed
- and all file systems are unmounted or
- mounted read-only, immediately
- followed by the
- reboot.
+ skipped, however all processes are
+ killed and all file systems are
+ unmounted or mounted read-only,
+ immediately followed by the reboot. If
+ is specified
+ twice the the operation is immediately
+ executed without terminating any
+ processes or unmounting any file
+ systems. This may result in data
+ loss.kexec
@@ -1086,6 +1149,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.
+
@@ -1118,7 +1218,8 @@
systemd1,
systemadm1,
- systemd-loginctl1,
+ journalctl1,
+ loginctl1,
systemd.unit5,
systemd.special7,
wall1