[systemd-commits] 7 commits - Makefile.am man/systemd-hostnamed.service.xml man/systemd-initctl.service.xml man/systemd-journald.service.xml man/systemd-localed.service.xml man/systemd-logind.service.xml man/systemd-shutdownd.service.xml man/systemd-timedated.service.xml man/systemd-udevd.service.xml man/systemd-user-sessions.service.xml src/core units/systemd-hostnamed.service.in units/systemd-initctl.service.in units/systemd-localed.service.in units/systemd-shutdownd.service.in
Lennart Poettering
lennart at kemper.freedesktop.org
Mon Jun 25 15:22:47 PDT 2012
Makefile.am | 26 +++++++++-
man/systemd-hostnamed.service.xml | 82 +++++++++++++++++++++++++++++++++
man/systemd-initctl.service.xml | 74 ++++++++++++++++++++++++++++++
man/systemd-journald.service.xml | 4 -
man/systemd-localed.service.xml | 83 ++++++++++++++++++++++++++++++++++
man/systemd-logind.service.xml | 4 -
man/systemd-shutdownd.service.xml | 75 ++++++++++++++++++++++++++++++
man/systemd-timedated.service.xml | 10 ++--
man/systemd-udevd.service.xml | 8 +--
man/systemd-user-sessions.service.xml | 2
src/core/dbus-manager.c | 18 -------
units/systemd-hostnamed.service.in | 3 -
units/systemd-initctl.service.in | 1
units/systemd-localed.service.in | 3 -
units/systemd-shutdownd.service.in | 1
15 files changed, 357 insertions(+), 37 deletions(-)
New commits:
commit 11901ad59689002aa7bbf598e76617f1cfeebd34
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 26 00:21:13 2012 +0200
man: document systemd-shutdownd
diff --git a/Makefile.am b/Makefile.am
index e3a179b..751511b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -490,7 +490,8 @@ MANPAGES = \
man/systemd-inhibit.1 \
man/systemd-remount-fs.service.8 \
man/systemd-update-utmp-runlevel.service.8 \
- man/systemd-initctl.service.8
+ man/systemd-initctl.service.8 \
+ man/systemd-shutdownd.service.8
MANPAGES_ALIAS = \
man/reboot.8 \
@@ -502,7 +503,8 @@ MANPAGES_ALIAS = \
man/systemd-remount-fs.8 \
man/systemd-update-utmp-shutdown.service.8 \
man/systemd-update-utmp.8 \
- man/systemd-initctl.8
+ man/systemd-initctl.8 \
+ man/systemd-shutdownd.8
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
@@ -514,6 +516,7 @@ man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
man/systemd-initctl.8: man/systemd-initctl.service.8
+man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
diff --git a/man/systemd-shutdownd.service.xml b/man/systemd-shutdownd.service.xml
new file mode 100644
index 0000000..146495a
--- /dev/null
+++ b/man/systemd-shutdownd.service.xml
@@ -0,0 +1,75 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+ This file is part of systemd.
+
+ Copyright 2012 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="systemd-shutdownd.service">
+
+ <refentryinfo>
+ <title>systemd-shutdownd.service</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-shutdownd.service</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-shutdownd.service</refname>
+ <refname>systemd-shutdownd</refname>
+ <refpurpose>systemd scheduled shutdown daemon</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>systemd-shutdownd.service</filename></para>
+ <para><filename>/usr/lib/systemd/systemd-shutdownd</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para><filename>systemd-shutdownd.service</filename> is a
+ system service that implements scheduled shutdowns, as
+ exposed by
+ <citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+ <filename>systemd-shutdownd.service</filename> is automatically activated on request and terminates
+ itself when it is unused.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>shutdown</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/units/systemd-shutdownd.service.in b/units/systemd-shutdownd.service.in
index b9e271f..f51417f 100644
--- a/units/systemd-shutdownd.service.in
+++ b/units/systemd-shutdownd.service.in
@@ -7,6 +7,7 @@
[Unit]
Description=Delayed Shutdown Service
+Documentation=man:systemd-shutdown.service(8)
DefaultDependencies=no
[Service]
commit f59e0b64351adec735d06ccf0d0ff0eb31c902c0
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 26 00:15:59 2012 +0200
man: document systemd-initctl
diff --git a/Makefile.am b/Makefile.am
index 0544814..e3a179b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,7 +489,8 @@ MANPAGES = \
man/journalctl.1 \
man/systemd-inhibit.1 \
man/systemd-remount-fs.service.8 \
- man/systemd-update-utmp-runlevel.service.8
+ man/systemd-update-utmp-runlevel.service.8 \
+ man/systemd-initctl.service.8
MANPAGES_ALIAS = \
man/reboot.8 \
@@ -500,7 +501,8 @@ MANPAGES_ALIAS = \
man/systemd-journald.8 \
man/systemd-remount-fs.8 \
man/systemd-update-utmp-shutdown.service.8 \
- man/systemd-update-utmp.8
+ man/systemd-update-utmp.8 \
+ man/systemd-initctl.8
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
@@ -511,6 +513,7 @@ man/systemd-journald.8: man/systemd-journald.service.8
man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-initctl.8: man/systemd-initctl.service.8
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
diff --git a/man/systemd-initctl.service.xml b/man/systemd-initctl.service.xml
new file mode 100644
index 0000000..92d91fc
--- /dev/null
+++ b/man/systemd-initctl.service.xml
@@ -0,0 +1,74 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+ This file is part of systemd.
+
+ Copyright 2012 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="systemd-initctl.service">
+
+ <refentryinfo>
+ <title>systemd-initctl.service</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-initctl.service</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-initctl.service</refname>
+ <refname>systemd-initctl</refname>
+ <refpurpose>systemd <filename>/dev/initctl</filename> Compatibility</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>systemd-initctl.service</filename></para>
+ <para><filename>/usr/lib/systemd/systemd-initctl</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para><filename>systemd-initctl</filename> is a system
+ service that implements compatibility with the
+ <filename>/dev/initctl</filename> FIFO file system
+ object, as implemented by the SysV init system. <filename>systemd-initctl</filename> is
+ automatically activated on request and terminates
+ itself when it is unused.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 11e2286..27e663c 100644
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -7,6 +7,7 @@
[Unit]
Description=/dev/initctl Compatibility Daemon
+Documentation=man:systemd-initctl.service(8)
DefaultDependencies=no
[Service]
commit 4940835715197bcc5924fc5e4d163a07b0940e02
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 26 00:12:00 2012 +0200
man: various minor fixes
diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml
index 13b3de0..94ae062 100644
--- a/man/systemd-hostnamed.service.xml
+++ b/man/systemd-hostnamed.service.xml
@@ -24,7 +24,7 @@
<refentry id="systemd-hostnamed.service">
<refentryinfo>
- <title>systemd-hostnamed</title>
+ <title>systemd-hostnamed.service</title>
<productname>systemd</productname>
<authorgroup>
@@ -38,7 +38,7 @@
</refentryinfo>
<refmeta>
- <refentrytitle>systemd-hostnamed</refentrytitle>
+ <refentrytitle>systemd-hostnamed.service</refentrytitle>
<manvolnum>8</manvolnum>
</refmeta>
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 43df3e7..65f6e52 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -24,7 +24,7 @@
<refentry id="systemd-journald.service">
<refentryinfo>
- <title>systemd-journald</title>
+ <title>systemd-journald.service</title>
<productname>systemd</productname>
<authorgroup>
@@ -38,7 +38,7 @@
</refentryinfo>
<refmeta>
- <refentrytitle>systemd-journald</refentrytitle>
+ <refentrytitle>systemd-journald.service</refentrytitle>
<manvolnum>8</manvolnum>
</refmeta>
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
index df746fc..121508e 100644
--- a/man/systemd-localed.service.xml
+++ b/man/systemd-localed.service.xml
@@ -24,7 +24,7 @@
<refentry id="systemd-localed.service">
<refentryinfo>
- <title>systemd-localed</title>
+ <title>systemd-localed.service</title>
<productname>systemd</productname>
<authorgroup>
@@ -38,7 +38,7 @@
</refentryinfo>
<refmeta>
- <refentrytitle>systemd-localed</refentrytitle>
+ <refentrytitle>systemd-localed.service</refentrytitle>
<manvolnum>8</manvolnum>
</refmeta>
diff --git a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml
index 9cef4ad..ee2e2bb 100644
--- a/man/systemd-logind.service.xml
+++ b/man/systemd-logind.service.xml
@@ -24,7 +24,7 @@
<refentry id="systemd-logind.service">
<refentryinfo>
- <title>systemd-logind</title>
+ <title>systemd-logind.service</title>
<productname>systemd</productname>
<authorgroup>
@@ -38,7 +38,7 @@
</refentryinfo>
<refmeta>
- <refentrytitle>systemd-logind</refentrytitle>
+ <refentrytitle>systemd-logind.service</refentrytitle>
<manvolnum>8</manvolnum>
</refmeta>
diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index 1cf6a07..4bc5d9e 100644
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.xml
@@ -24,7 +24,7 @@
<refentry id="systemd-timedated.service">
<refentryinfo>
- <title>systemd-timedated</title>
+ <title>systemd-timedated.service</title>
<productname>systemd</productname>
<authorgroup>
@@ -38,7 +38,7 @@
</refentryinfo>
<refmeta>
- <refentrytitle>systemd-timedated</refentrytitle>
+ <refentrytitle>systemd-timedated.service</refentrytitle>
<manvolnum>8</manvolnum>
</refmeta>
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 09b4744..0c76d05 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -3,9 +3,9 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<refentry id="systemd-udevd">
+<refentry id="systemd-udevd.service">
<refentryinfo>
- <title>udevd</title>
+ <title>systemd-udevd.service</title>
<productname>systemd</productname>
<authorgroup>
<author>
@@ -18,7 +18,7 @@
</refentryinfo>
<refmeta>
- <refentrytitle>systemd-udevd</refentrytitle>
+ <refentrytitle>systemd-udevd.service</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="version"></refmiscinfo>
</refmeta>
@@ -30,7 +30,7 @@
</refnamediv>
<refsynopsisdiv>
- <para><filename>systemd-logind.service</filename></para>
+ <para><filename>systemd-udevd.service</filename></para>
<cmdsynopsis>
<command>/usr/lib/systemd/systemd-udevd</command>
commit 29f4f5118bfd958fc6d812af229535f98723dcb6
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 26 00:04:50 2012 +0200
man: document systemd-hostnamed
diff --git a/Makefile.am b/Makefile.am
index 5c74053..0544814 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2595,6 +2595,14 @@ hostnamed-install-data-hook:
INSTALL_DATA_HOOKS += \
hostnamed-install-data-hook
+MANPAGES += \
+ man/systemd-hostnamed.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-hostnamed.8
+
+man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+
EXTRA_DIST += \
units/systemd-hostnamed.service.in
endif
diff --git a/man/systemd-hostnamed.service.xml b/man/systemd-hostnamed.service.xml
new file mode 100644
index 0000000..13b3de0
--- /dev/null
+++ b/man/systemd-hostnamed.service.xml
@@ -0,0 +1,82 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+ This file is part of systemd.
+
+ Copyright 2012 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="systemd-hostnamed.service">
+
+ <refentryinfo>
+ <title>systemd-hostnamed</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-hostnamed</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-hostnamed.service</refname>
+ <refname>systemd-hostnamed</refname>
+ <refpurpose>systemd Hostname Bus Mechanism</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>systemd-hostnamed.service</filename></para>
+ <para><filename>/usr/lib/systemd/systemd-hostnamed</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para><filename>systemd-hostnamed</filename> is a system
+ service that may be used as mechanism to change the
+ system hostname. <filename>systemd-hostnamed</filename> is
+ automatically activated on request and terminates
+ itself when it is unused.</para>
+
+ <para>See the <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/hostnamed">
+ developer documentation</ulink> for information about
+ the APIs <filename>systemd-hostnamed</filename>
+ provides.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>sethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
index bdc2a08..df746fc 100644
--- a/man/systemd-localed.service.xml
+++ b/man/systemd-localed.service.xml
@@ -45,7 +45,7 @@
<refnamediv>
<refname>systemd-localed.service</refname>
<refname>systemd-localed</refname>
- <refpurpose>systemd Time and Date Bus Mechanism</refpurpose>
+ <refpurpose>systemd Locale Bus Mechanism</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -60,7 +60,7 @@
service that may be used as mechanism to change the
system locale settings, as well as the console key
mapping and default X11 key
- mapping. <filename>systemd-timedated</filename> is
+ mapping. <filename>systemd-localed</filename> is
automatically activated on request and terminates
itself when it is unused.</para>
diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in
index d7fd194..be22a3a 100644
--- a/units/systemd-hostnamed.service.in
+++ b/units/systemd-hostnamed.service.in
@@ -7,8 +7,7 @@
[Unit]
Description=Hostname Service
-Documentation=man:hostname(5)
-Documentation=man:machine-info(5)
+Documentation=man:systemd-hostnamed.service(8) man:hostname(5) man:machine-info(5)
Documentation=http://www.freedesktop.org/wiki/Software/systemd/hostnamed
[Service]
commit 2aac569ab4f7fa21cf634f5a82c1c7d69381ab25
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jun 26 00:03:43 2012 +0200
bus: drop HaveWatchdog option
Clients should always watch /dev/watchdog directly, instead of going
indirect. Let's keep our stacks small.
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index d3b26b7..cd827ca 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -247,8 +247,7 @@
" <property name=\"DefaultStandardOutput\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"DefaultStandardError\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"RuntimeWatchdogUSec\" type=\"s\" access=\"readwrite\"/>\n" \
- " <property name=\"ShutdownWatchdogUSec\" type=\"s\" access=\"readwrite\"/>\n" \
- " <property name=\"HaveWatchdog\" type=\"b\" access=\"read\"/>\n"
+ " <property name=\"ShutdownWatchdogUSec\" type=\"s\" access=\"readwrite\"/>\n"
#define BUS_MANAGER_INTERFACE_END \
" </interface>\n"
@@ -495,20 +494,6 @@ static int bus_manager_send_unit_files_changed(Manager *m) {
return r;
}
-static int bus_manager_append_have_watchdog(DBusMessageIter *i, const char *property, void *data) {
- dbus_bool_t b;
-
- assert(i);
- assert(property);
-
- b = access("/dev/watchdog", F_OK) >= 0;
-
- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
- return -ENOMEM;
-
- return 0;
-}
-
static int bus_manager_set_runtime_watchdog_usec(DBusMessageIter *i, const char *property, void *data) {
uint64_t *t = data;
@@ -557,7 +542,6 @@ static const BusProperty bus_manager_properties[] = {
{ "DefaultStandardError", bus_manager_append_exec_output, "s", offsetof(Manager, default_std_error) },
{ "RuntimeWatchdogUSec", bus_property_append_usec, "t", offsetof(Manager, runtime_watchdog), false, bus_manager_set_runtime_watchdog_usec },
{ "ShutdownWatchdogUSec", bus_property_append_usec, "t", offsetof(Manager, shutdown_watchdog), false, bus_property_set_usec },
- { "HaveWatchdog", bus_manager_append_have_watchdog, "b", 0 },
{ NULL, }
};
commit c84fe6fdf579ff8a69c0fc308ae4f00dfa0eb4a1
Author: Tom Gundersen <teg at jklm.no>
Date: Mon Jun 25 22:50:41 2012 +0200
man: fix typo in sysntemd-user-sessions.service page
diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml
index 338b701..5c65eb1 100644
--- a/man/systemd-user-sessions.service.xml
+++ b/man/systemd-user-sessions.service.xml
@@ -57,7 +57,7 @@
<para><filename>systemd-user-sessions.service</filename>
is a service that controls user logins. After basic
system initialization is complete it removes
- <filename>/run/login</filename>, thus permitting
+ <filename>/run/nologin</filename>, thus permitting
logins. Before system shutdown it creates
<filename>/run/nologin</filename>, thus prohibiting
further logins. At the same time it also kills all
commit 62ce62123dcbb667f0982a8ecc7d2d53ea6b92ce
Author: Lennart Poettering <lennart at poettering.net>
Date: Mon Jun 25 23:55:35 2012 +0200
man: document localed
diff --git a/Makefile.am b/Makefile.am
index 3dad313..5c74053 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2645,6 +2645,14 @@ localed-install-data-hook:
INSTALL_DATA_HOOKS += \
localed-install-data-hook
+MANPAGES += \
+ man/systemd-localed.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-localed.8
+
+man/systemd-localed.8: man/systemd-localed.service.8
+
EXTRA_DIST += \
units/systemd-localed.service.in
diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml
new file mode 100644
index 0000000..bdc2a08
--- /dev/null
+++ b/man/systemd-localed.service.xml
@@ -0,0 +1,83 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+ This file is part of systemd.
+
+ Copyright 2012 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="systemd-localed.service">
+
+ <refentryinfo>
+ <title>systemd-localed</title>
+ <productname>systemd</productname>
+
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Lennart</firstname>
+ <surname>Poettering</surname>
+ <email>lennart at poettering.net</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-localed</refentrytitle>
+ <manvolnum>8</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-localed.service</refname>
+ <refname>systemd-localed</refname>
+ <refpurpose>systemd Time and Date Bus Mechanism</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>systemd-localed.service</filename></para>
+ <para><filename>/usr/lib/systemd/systemd-localed</filename></para>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+
+ <para><filename>systemd-localed</filename> is a system
+ service that may be used as mechanism to change the
+ system locale settings, as well as the console key
+ mapping and default X11 key
+ mapping. <filename>systemd-timedated</filename> is
+ automatically activated on request and terminates
+ itself when it is unused.</para>
+
+ <para>See the <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/localed">
+ developer documentation</ulink> for information about
+ the APIs <filename>systemd-localed</filename>
+ provides.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>vconsole.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ </para>
+ </refsect1>
+
+</refentry>
diff --git a/man/systemd-timedated.service.xml b/man/systemd-timedated.service.xml
index 354fcd6..1cf6a07 100644
--- a/man/systemd-timedated.service.xml
+++ b/man/systemd-timedated.service.xml
@@ -58,11 +58,11 @@
<para><filename>systemd-timedated</filename> is a
system service that may be used as mechanism to change
- the system clock and timezone, as well as
+ the system clock and timezone, as well as to
enable/disable NTP time
synchronization. <filename>systemd-timedated</filename>
- is only activated on requests and terminates itself
- when it is unused.</para>
+ is automatically activated on request and terminates
+ itself when it is unused.</para>
<para>See the <ulink
url="http://www.freedesktop.org/wiki/Software/systemd/timedated">
diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in
index f973fa4..6818a4c 100644
--- a/units/systemd-localed.service.in
+++ b/units/systemd-localed.service.in
@@ -7,9 +7,8 @@
[Unit]
Description=Locale Service
+Documentation=man:systemd-localed.service(8) man:locale.conf(5) man:vconsole.conf(5)
Documentation=http://www.freedesktop.org/wiki/Software/systemd/localed
-Documentation=man:locale.conf(5)
-Documentation=man:vconsole.conf(5)
[Service]
ExecStart=@rootlibexecdir@/systemd-localed
More information about the systemd-commits
mailing list