diff --git a/man/shutdown.xml b/man/shutdown.xml
index f2274a8a8c..95884921ac 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -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, now is
+ implied.
+
+ Note that to specify a wall message you must
+ speciy 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.
@@ -126,6 +145,39 @@
message before
halt, power-off, reboot.
+
+
+
+
+ Skip file system check
+ on reboot. This is equivalent to
+ creating the
+ /fastboot file
+ before going down.
+
+
+
+
+
+ Force file system
+ check on reboot. This is equivalent to
+ creating the
+ /forcefsck file
+ before going down.
+
+
+
+
+
+ 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.
+
+
diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in
index c6c2393fc3..2855f6a25f 100644
--- a/man/systemd.special.xml.in
+++ b/man/systemd.special.xml.in
@@ -655,6 +655,26 @@
connected to syslog or the
kernel log buffer.
+
+
+ systemd-shutdownd.service
+
+ This is internally used
+ by
+ shutdown8
+ to implement delayed shutdowns.
+ This is a
+ socket-activated service, see
+ system-shutdownd.socket.
+
+
+
+ systemd-shutdownd.socket
+
+ Socket activation unit
+ for
+ system-shutdownd.service.
+ umount.target
@@ -723,9 +743,9 @@
See Also
- systemd.unit5
- systemd.service5
- systemd.socket5
+ systemd.unit5,
+ systemd.service5,
+ systemd.socket5,
systemd.target5
diff --git a/man/systemd.xml b/man/systemd.xml
index b35469c102..6edce4996a 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -937,6 +937,17 @@
abstract namespace.
+
+ @/org/freedesktop/systemd1/shutdown
+
+ Used internally by the
+ shutdown8
+ tool to implement delayed
+ shutdowns. This is an AF_UNIX datagram
+ socket in the Linux abstract
+ namespace.
+
+
@/org/freedesktop/systemd1/private