[systemd-commits] 3 commits - Makefile.am man/shutdown.xml man/systemd.special.xml.in man/systemd.xml units/systemd-initctl.service.in units/systemd-logger.service.in units/systemd-shutdownd.service.in units/systemd-shutdownd.socket
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Aug 16 06:56:50 PDT 2010
Makefile.am | 5 +-
man/shutdown.xml | 64 +++++++++++++++++++++++++++++++++----
man/systemd.special.xml.in | 26 +++++++++++++--
man/systemd.xml | 11 ++++++
units/systemd-initctl.service.in | 1
units/systemd-logger.service.in | 1
units/systemd-shutdownd.service.in | 3 +
units/systemd-shutdownd.socket | 2 -
8 files changed, 100 insertions(+), 13 deletions(-)
New commits:
commit 5dc50792ac1bc627bf9b50d259b4e7546b3f8d86
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Aug 16 15:56:42 2010 +0200
man: document new shutdown features
diff --git a/man/shutdown.xml b/man/shutdown.xml
index f2274a8..9588492 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -49,7 +49,7 @@
<refsynopsisdiv>
<cmdsynopsis>
- <command>shutdown <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">now</arg> <arg choice="opt" rep="repeat">WALL</arg></command>
+ <command>shutdown <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">TIME</arg> <arg choice="opt" rep="repeat">WALL</arg></command>
</cmdsynopsis>
</refsynopsisdiv>
@@ -59,11 +59,30 @@
<para><command>shutdown</command> may be used to halt,
power-off or reboot the machine.</para>
- <para>The first argument should be the string
- <command>now</command> 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.</para>
+ <para>The first argument may be a time string (which
+ is usually <literal>now</literal>). Optionally, this
+ may be followed by a wall message to be sent to all
+ logged-in users before going down.</para>
+
+ <para>The time string may either be in the format
+ <literal>hh:mm</literal> for hour/minutes specifying
+ the time to execute the shutdown at, specified in 24h
+ clock format. Alternatively it may be in the syntax
+ <literal>+m</literal> referring to the specified
+ number of minutes m from now. <literal>now</literal>
+ is an alias for <literal>+0</literal>, i.e. for
+ triggering an immediate shutdown. If no time argument
+ is specified, <literal>now</literal> is
+ implied.</para>
+
+ <para>Note that to specify a wall message you must
+ speciy a time argument, too.</para>
+
+ <para>If the time argument is used, 5 minutes
+ before the system goes down the
+ <filename>/etc/nologin</filename> file is created to
+ ensure that further logins shall not be
+ allowed.</para>
</refsect1>
<refsect1>
@@ -126,6 +145,39 @@
message before
halt, power-off, reboot.</para></listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><option>-f</option></term>
+
+ <listitem><para>Skip file system check
+ on reboot. This is equivalent to
+ creating the
+ <filename>/fastboot</filename> file
+ before going down.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-F</option></term>
+
+ <listitem><para>Force file system
+ check on reboot. This is equivalent to
+ creating the
+ <filename>/forcefsck</filename> file
+ before going down.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-c</option></term>
+
+ <listitem><para>Cancel a pending
+ shutdown. This may be used cancel the
+ effect of an invocation of
+ <command>shutdown</command> with a
+ time argument that is not
+ <literal>+0</literal> or
+ <literal>now</literal>.</para></listitem>
+ </varlistentry>
+
</variablelist>
</refsect1>
diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in
index c6c2393..2855f6a 100644
--- a/man/systemd.special.xml.in
+++ b/man/systemd.special.xml.in
@@ -656,6 +656,26 @@
kernel log buffer.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><filename>systemd-shutdownd.service</filename></term>
+ <listitem>
+ <para>This is internally used
+ by
+ <citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ to implement delayed shutdowns.</para>
+ <para>This is a
+ socket-activated service, see
+ <filename>system-shutdownd.socket</filename>.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><filename>systemd-shutdownd.socket</filename></term>
+ <listitem>
+ <para>Socket activation unit
+ for
+ <filename>system-shutdownd.service</filename>.</para>
+ </listitem>
+ </varlistentry>
<varlistentry>
<term><filename>umount.target</filename></term>
<listitem>
@@ -723,9 +743,9 @@
<refsect1>
<title>See Also</title>
<para>
- <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
diff --git a/man/systemd.xml b/man/systemd.xml
index b35469c..6edce49 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -938,6 +938,17 @@
</varlistentry>
<varlistentry>
+ <term><filename>@/org/freedesktop/systemd1/shutdown</filename></term>
+
+ <listitem><para>Used internally by the
+ <citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ tool to implement delayed
+ shutdowns. This is an AF_UNIX datagram
+ socket in the Linux abstract
+ namespace.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><filename>@/org/freedesktop/systemd1/private</filename></term>
<listitem><para>Used internally as
commit d8fa9401d3aacbc8caad9c353a03a36a399aecd3
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Aug 16 15:41:30 2010 +0200
units: enable notify interface for internals services
diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 6d56e12..78f16c8 100644
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -13,3 +13,4 @@ DefaultDependencies=no
[Service]
ExecStart=@rootlibexecdir@/systemd-initctl
+NotifyAccess=all
diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index 2004438..1e8e2cf 100644
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -13,3 +13,4 @@ After=@SPECIAL_SYSLOG_SERVICE@
[Service]
ExecStart=@rootlibexecdir@/systemd-logger
+NotifyAccess=all
diff --git a/units/systemd-shutdownd.service.in b/units/systemd-shutdownd.service.in
index 5d0bd77..292c3ed 100644
--- a/units/systemd-shutdownd.service.in
+++ b/units/systemd-shutdownd.service.in
@@ -8,8 +8,9 @@
# See systemd.special(7) for details
[Unit]
-Description=systemd Shutdown Daemon
+Description=systemd Delayed Shutdown Daemon
DefaultDependencies=no
[Service]
ExecStart=@rootlibexecdir@/systemd-shutdownd
+NotifyAccess=all
diff --git a/units/systemd-shutdownd.socket b/units/systemd-shutdownd.socket
index 9a95fa9..fdf2a06 100644
--- a/units/systemd-shutdownd.socket
+++ b/units/systemd-shutdownd.socket
@@ -8,7 +8,7 @@
# See systemd.special(7) for details
[Unit]
-Description=systemd Shutdown Socket
+Description=systemd Delayed Shutdown Socket
DefaultDependencies=no
Before=sockets.target
commit a145090c8233022d00c22f983474befb013abcd8
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Aug 16 15:41:12 2010 +0200
shutdownd: enable by default
diff --git a/Makefile.am b/Makefile.am
index 07204a9..e3cef51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -779,9 +779,10 @@ install-data-hook:
rm -f session && \
$(LN_S) $(pkgsysconfdir)/session session )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
- rm -f systemd-initctl.socket systemd-logger.socket && \
+ rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket && \
$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
- $(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
+ $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
+ $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
$(LN_S) ../systemd-update-utmp-runlevel.service )
More information about the systemd-commits
mailing list