X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fshutdown.xml;h=d54fcb25ab2acd3a3a35837d1c1516a4f94f8af8;hb=8f33b5b8b3e85f9c3b00eb004e601f7a72fa6461;hp=ab14e3d704648266cd7d45603496d81fd2fd5d6d;hpb=7874bcd6028d1efbb4451c8b5cf5b2ac8d77af74;p=elogind.git
diff --git a/man/shutdown.xml b/man/shutdown.xml
index ab14e3d70..d54fcb25a 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.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 .
-->
@@ -49,7 +49,7 @@
- shutdown OPTIONSnowWALL
+ shutdown OPTIONSTIMEWALL
@@ -59,11 +59,30 @@
shutdown may be used to halt,
power-off or reboot the machine.
- The first argument should be the string
- now which however is ignored by
- this implementation. Optionally, this may be followed
- by a wall message to be sent to all logged-in users
- before going down.
+ The first argument may be a time string (which
+ is usually now). Optionally, this
+ may be followed by a wall message to be sent to all
+ logged-in users before going down.
+
+ The time string may either be in the format
+ hh:mm for hour/minutes specifying
+ the time to execute the shutdown at, specified in 24h
+ clock format. Alternatively it may be in the syntax
+ +m referring to the specified
+ number of minutes m from now. now
+ is an alias for +0, i.e. for
+ triggering an immediate shutdown. If no time argument
+ is specified, +1 is
+ implied.
+
+ Note that to specify a wall message you must
+ specify a time argument, too.
+
+ If the time argument is used, 5 minutes
+ before the system goes down the
+ /etc/nologin file is created to
+ ensure that further logins shall not be
+ allowed.
@@ -112,7 +131,7 @@
-
+ Don't halt, power-off,
reboot, just write wall
@@ -126,6 +145,19 @@
message before
halt, power-off, reboot.
+
+
+
+
+ Cancel a pending
+ shutdown. This may be used cancel the
+ effect of an invocation of
+ shutdown with a
+ time argument that is not
+ +0 or
+ now.
+
+