[systemd-commits] 2 commits - TODO man/systemd.xml src/core
Lennart Poettering
lennart at kemper.freedesktop.org
Fri Jul 19 09:45:58 PDT 2013
TODO | 2 -
man/systemd.xml | 50 ++++++++++++++++++++++++++++++-----------------
src/core/load-fragment.c | 17 +++++++++++++++
3 files changed, 50 insertions(+), 19 deletions(-)
New commits:
commit 7f0386f62c128896519aafa203caa1b3aafd4393
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jul 19 18:45:11 2013 +0200
core: update configuration directive list "systemd --dump-configuration-items" shows
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index cf92f0d..e5fc4a3 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2647,6 +2647,23 @@ void unit_dump_config_items(FILE *f) {
{ config_parse_unit_condition_string, "CONDITION" },
{ config_parse_unit_condition_null, "CONDITION" },
{ config_parse_unit_slice, "SLICE" },
+ { config_parse_documentation, "URL" },
+ { config_parse_service_timeout, "SECONDS" },
+ { config_parse_start_limit_action, "ACTION" },
+ { config_parse_set_status, "STATUS" },
+ { config_parse_service_sockets, "SOCKETS" },
+ { config_parse_fsck_passno, "PASSNO" },
+ { config_parse_environ, "ENVIRON" },
+ { config_parse_syscall_filter, "SYSCALL" },
+ { config_parse_cpu_shares, "SHARES" },
+ { config_parse_memory_limit, "LIMIT" },
+ { config_parse_device_allow, "DEVICE" },
+ { config_parse_device_policy, "POLICY" },
+ { config_parse_blockio_bandwidth, "BANDWIDTH" },
+ { config_parse_blockio_weight, "WEIGHT" },
+ { config_parse_blockio_device_weight, "DEVICEWEIGHT" },
+ { config_parse_long, "LONG" },
+ { config_parse_socket_service, "SERVICE" },
};
const char *prev = NULL;
commit 1ec96668dd0dcb19cc2f7b99cbf73df0d769c97d
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jul 19 18:44:33 2013 +0200
man: list scope and slice units in systemd(1)
diff --git a/TODO b/TODO
index d1d7140..ffd845b 100644
--- a/TODO
+++ b/TODO
@@ -46,7 +46,7 @@ CGroup Rework Completion:
* introduce high-level settings for RT budget, swappiness
* wiki: document new bus APIs of PID 1 (transient units, Reloading signal)
-* review: scope units, slice units, pid1, pam_system, systemctl commands
+* review: scope units, slice units, pam_system, systemctl commands
* Send SIGHUP and SIGTERM in session scopes
diff --git a/man/systemd.xml b/man/systemd.xml
index c7aed3c..06d2ecf 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -285,25 +285,27 @@
<title>Concepts</title>
<para>systemd provides a dependency system between
- various entities called "units". Units encapsulate
- various objects that are relevant for system boot-up
- and maintenance. The majority of units are configured
- in unit configuration files, whose syntax and basic
- set of options is described in
+ various entities called "units" of 12 different
+ types. Units encapsulate various objects that are
+ relevant for system boot-up and maintenance. The
+ majority of units are configured in unit configuration
+ files, whose syntax and basic set of options is
+ described in
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
however some are created automatically from other
- configuration or dynamically from system state. Units
- may be 'active' (meaning started, bound, plugged in,
- ... depending on the unit type, see below), or
- 'inactive' (meaning stopped, unbound, unplugged, ...),
- as well as in the process of being activated or
- deactivated, i.e. between the two states (these states
- are called 'activating', 'deactivating'). A special
- 'failed' state is available as well which is very
- similar to 'inactive' and is entered when the service
- failed in some way (process returned error code on
- exit, or crashed, or an operation timed out). If this
- state is entered the cause will be logged, for later
+ configuration, dynamically from system state or
+ programmatically at runtime. Units may be 'active'
+ (meaning started, bound, plugged in, ... depending on
+ the unit type, see below), or 'inactive' (meaning
+ stopped, unbound, unplugged, ...), as well as in the
+ process of being activated or deactivated,
+ i.e. between the two states (these states are called
+ 'activating', 'deactivating'). A special 'failed'
+ state is available as well which is very similar to
+ 'inactive' and is entered when the service failed in
+ some way (process returned error code on exit, or
+ crashed, or an operation timed out). If this state is
+ entered the cause will be logged, for later
reference. Note that the various unit types may have a
number of additional substates, which are mapped to
the five generalized unit states described
@@ -312,7 +314,7 @@
<para>The following unit types are available:</para>
<orderedlist>
- <listitem><para>Service units, which control
+ <listitem><para>Service units, which start and control
daemons and the processes they consist of. For
details see
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
@@ -369,6 +371,18 @@
objects change or are modified. See
<citerefentry><refentrytitle>systemd.path</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
+ <listitem><para>Slice units may be used to
+ group units which manage system processes
+ (such as service and scope units) in a
+ hierachial tree for resource management
+ purposes. See
+ <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
+
+ <listitem><para>Scope units are similar to
+ service units, but manage foreign processes
+ instead of starting them as well. See
+ <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
+
</orderedlist>
<para>Units are named as their configuration
More information about the systemd-commits
mailing list