[systemd-commits] 3 commits - TODO man/loginctl.xml man/machinectl.xml man/systemd-nspawn.xml man/systemd-run.xml src/run
Lennart Poettering
lennart at kemper.freedesktop.org
Fri Jul 19 09:02:44 PDT 2013
TODO | 4 ++--
man/loginctl.xml | 4 ++--
man/machinectl.xml | 17 ++++++++---------
man/systemd-nspawn.xml | 23 ++++++++++++-----------
man/systemd-run.xml | 37 +++++++++++++++++++++++++++----------
src/run/run.c | 2 +-
6 files changed, 52 insertions(+), 35 deletions(-)
New commits:
commit f7f74d8ec46532f13a1dc418d550eaf76b339fa3
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jul 19 18:00:21 2013 +0200
man: a few corrections to the machinectl man page
diff --git a/man/loginctl.xml b/man/loginctl.xml
index e129d1b..ef0dfc0 100644
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -91,7 +91,7 @@
<term><option>--property=</option></term>
<listitem><para>When showing
- session/user properties, limit
+ session/user/seat properties, limit
display to certain properties as
specified as argument. If not
specified, all set properties are
@@ -108,7 +108,7 @@
<term><option>--all</option></term>
<listitem><para>When showing
- unit/job/manager properties, show all
+ session/user/seat properties, show all
properties regardless whether they are
set or not.</para></listitem>
</varlistentry>
diff --git a/man/machinectl.xml b/man/machinectl.xml
index ced304d..37fefea 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -91,7 +91,7 @@
<term><option>--property=</option></term>
<listitem><para>When showing
- session/user properties, limit the
+ machine properties, limit the
output to certain properties as
specified by the argument. If not
specified, all set properties are
@@ -108,7 +108,7 @@
<term><option>--all</option></term>
<listitem><para>When showing
- unit/job/manager properties, show all
+ machine properties, show all
properties regardless of whether they are
set or not.</para></listitem>
</varlistentry>
@@ -141,13 +141,13 @@
<term><option>--kill-who=</option></term>
<listitem><para>When used with
- <command>kill-session</command>,
+ <command>kill-machine</command>,
choose which processes to kill. Must
be one of <option>leader</option>, or
<option>all</option> to select whether
to kill only the leader process of the
- session or all processes of the
- session. If omitted, defaults to
+ machine or all processes of the
+ machine. If omitted, defaults to
<option>all</option>.</para></listitem>
</varlistentry>
@@ -156,11 +156,10 @@
<term><option>--signal=</option></term>
<listitem><para>When used with
- <command>kill-session</command> or
- <command>kill-user</command>, choose
+ <command>kill-machine</command> choose
which signal to send to selected
- processes. Must be one of the well-known
- signal specifiers, such as
+ processes. Must be one of the
+ well-known signal specifiers, such as
<constant>SIGTERM</constant>,
<constant>SIGINT</constant> or
<constant>SIGSTOP</constant>. If
commit 431c72dc3d482732a01d3ab929aa9b2c36422d46
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jul 19 17:55:52 2013 +0200
man: update systemd-nspawn regarding new --slice= logic
diff --git a/TODO b/TODO
index d111f36..63b1280 100644
--- a/TODO
+++ b/TODO
@@ -45,8 +45,8 @@ CGroup Rework Completion:
* introduce high-level settings for RT budget, swappiness
-* wiki: document new bus APIs of PID 1 (transient units, Reloading signal), systemctl commands
-* review: scope units, slice units, pid1, machinectl, libsystem-login, pam_systemd, systemd-run, systemd-nspawn
+* wiki: document new bus APIs of PID 1 (transient units, Reloading signal)
+* review: scope units, slice units, pid1, machinectl, libsystem-login, pam_system, systemctl commands
* Send SIGHUP and SIGTERM in session scopes
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index feafb31..f4c5d77 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -240,6 +240,16 @@
</varlistentry>
<varlistentry>
+ <term><option>--slice=</option></term>
+
+ <listitem><para>Make the container
+ part of the specified slice, instead
+ of the
+ <filename>machine.slice</filename>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--uuid=</option></term>
<listitem><para>Set the specified UUID
@@ -251,16 +261,6 @@
</varlistentry>
<varlistentry>
- <term><option>-C</option></term>
- <term><option>--controllers=</option></term>
-
- <listitem><para>Makes the container appear in
- other hierarchies than the name=systemd:/ one.
- Takes a comma-separated list of controllers.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>--private-network</option></term>
<listitem><para>Turn off networking in
@@ -443,7 +443,8 @@
<citerefentry><refentrytitle>unshare</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>
</para>
</refsect1>
commit 3803cde44c3d949765bdf0e8bce06886224d40b4
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jul 19 17:51:26 2013 +0200
man: extend systemd-run man page a little
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 4ced9bf..98ee476 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -44,7 +44,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refnamediv>
<refname>systemd-run</refname>
- <refpurpose>Run programs as volatile systemd units</refpurpose>
+ <refpurpose>Run programs in transient scope or service units</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -60,11 +60,26 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<refsect1>
<title>Description</title>
- <para><command>systemd-run</command> may be used
- create a transient <filename>.service</filename> unit
- or a <filename>.scope</filename> unit and launch the
- specified <replaceable>COMMAND</replaceable> as part
- of this unit.</para>
+ <para><command>systemd-run</command> may be used create and start
+ a transient <filename>.service</filename> or a
+ <filename>.scope</filename> unit and run the specified
+ <replaceable>COMMAND</replaceable> in it.</para>
+
+ <para>If a command is run as transient service unit, it will be
+ started and managed by the service manager like any other service,
+ and thus show up in the output of <command>systemctl
+ list-units</command> like any other unit. It will run in a clean
+ and detached execution environment. <command>systemd-run</command>
+ will start the service asynchronously in the background and
+ immediately return.</para>
+
+ <para>If a command is run as transient scope unit, it will be
+ started directly by <command>systemd-run</command> and thus
+ inherit the execution environment of the caller. It is however
+ managed by the service manager similar to normal services, and
+ will also show up in the output of <command>systemctl
+ list-units</command>. Execution in this case is synchronous, and
+ execution will return only when the command finishes.</para>
</refsect1>
<refsect1>
@@ -92,8 +107,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<term><option>--user</option></term>
<listitem>
- <para>Talk to the systemd manager of the calling
- user.</para>
+ <para>Talk to the service manager of the calling user,
+ rather than the service manager of the system.</para>
</listitem>
</varlistentry>
@@ -101,7 +116,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<term><option>--scope</option></term>
<listitem>
- <para>Create a <filename>.scope</filename> unit instead of
+ <para>Create a transient <filename>.scope</filename> unit instead of
the default transient <filename>.service</filename> unit.
</para>
</listitem>
@@ -136,7 +151,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para>All command-line arguments after the first non-option
argument become part of the commandline of the launched
- process.</para>
+ process. If a command is run as service unit its first argument
+ needs to be an absolute binary path.</para>
</refsect1>
<refsect1>
@@ -150,6 +166,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
diff --git a/src/run/run.c b/src/run/run.c
index e5a62d9..e56a977 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -38,7 +38,7 @@ static const char *arg_slice = NULL;
static int help(void) {
printf("%s [OPTIONS...] [COMMAND LINE...]\n\n"
- "Notify the init system about service status updates.\n\n"
+ "Run the specified command in a transient scope or service unit.\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --user Run as user unit\n"
More information about the systemd-commits
mailing list