summaryrefslogtreecommitdiff
path: root/man/systemd-activate.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-02-11 23:33:09 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-02-13 11:54:39 -0500
commitcf98937cc73201a71fabbd35fd9853cbe2790ed0 (patch)
tree960390a70fee850f25a2aa89303ddb1223a55890 /man/systemd-activate.xml
parentafe773b01a704b98a350a36fa518bfcd6a54323b (diff)
activate: allow multiple, possibly invalid, fd names
Previous code only allowed a single name to be passed, and duplicated it over all descriptors. For the sake of testing, allow different names and in arbitrary number. If just one is given, duplicate it to match the number of sockets. This matches previuos behaviour. Since this is a testing tool, it seems useful to allow passing invalid names to test application behaviour with invalid names. Hence, only warn. When warning, escape the name.
Diffstat (limited to 'man/systemd-activate.xml')
-rw-r--r--man/systemd-activate.xml16
1 files changed, 9 insertions, 7 deletions
diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml
index 995e6eecce..a8e17f2a2a 100644
--- a/man/systemd-activate.xml
+++ b/man/systemd-activate.xml
@@ -136,13 +136,15 @@
</varlistentry>
<varlistentry>
- <term><option>--fdname=</option><replaceable>NAME</replaceable></term>
-
- <listitem><para>Specify a name for the activation file
- descriptors. This is equivalent to setting
- <varname>FileDescriptorName=</varname> in socket unit files, and
- enables use of
- <citerefentry><refentrytitle>sd_listen_fds_with_names</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para></listitem>
+ <term><option>--fdname=</option><replaceable>NAME</replaceable><optional>:<replaceable>NAME</replaceable>...</optional></term>
+
+ <listitem><para>Specify names for the file descriptors passed. This is equivalent to setting
+ <varname>FileDescriptorName=</varname> in socket unit files, and enables use of
+ <citerefentry><refentrytitle>sd_listen_fds_with_names</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
+ Multiple entries may be specifies using separate options or by separating names with colons
+ (<literal>:</literal>) in one option. In case more names are given than descriptors, superflous ones willl be
+ ignored. In case less names are given than descriptors, the remaining file descriptors will be unnamed.
+ </para></listitem>
</varlistentry>
<xi:include href="standard-options.xml" xpointer="help" />