X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemctl.xml;h=b5ae48cb44021946d7afdaaf3cce1aaa248e9d30;hb=399c5f96331ad5281fdb75a7c0c66cc703f7eeb6;hp=c467ed8bf72f5c007044a47466e0663930cdbd13;hpb=5c3246b1a6bbe8c44210f7a73f0e030dcb21f7bb;p=elogind.git
diff --git a/man/systemctl.xml b/man/systemctl.xml
index c467ed8bf..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.
@@ -448,7 +450,7 @@
formatting of the journal entries that
are shown. For the available choices
see
- systemd-journalctl1. Defaults
+ journalctl1. Defaults
to
short.
@@ -1147,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.
+
@@ -1179,8 +1218,8 @@
systemd1,
systemadm1,
- systemd-journalctl1,
- systemd-loginctl1,
+ journalctl1,
+ loginctl1,
systemd.unit5,
systemd.special7,
wall1