summaryrefslogtreecommitdiff
path: root/Makefile-man.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-04 17:36:19 +0200
committerLennart Poettering <lennart@poettering.net>2015-10-06 11:52:48 +0200
commit8dd4c05b5495c7ffe0f12ace87e71abe17bd0a0e (patch)
tree30a788ca911facca15b4f1fa8641e78753caa574 /Makefile-man.am
parent79c7626d1f239e02152ad698298a1b5d0e9fbacf (diff)
downloadsystemd-8dd4c05b5495c7ffe0f12ace87e71abe17bd0a0e.tar.gz
core: add support for naming file descriptors passed using socket activation
This adds support for naming file descriptors passed using socket activation. The names are passed in a new $LISTEN_FDNAMES= environment variable, that matches the existign $LISTEN_FDS= one and contains a colon-separated list of names. This also adds support for naming fds submitted to the per-service fd store using FDNAME= in the sd_notify() message. This also adds a new FileDescriptorName= setting for socket unit files to set the name for fds created by socket units. This also adds a new call sd_listen_fds_with_names(), that is similar to sd_listen_fds(), but also returns the names of the fds. systemd-activate gained the new --fdname= switch to specify a name for testing socket activation. This is based on #1247 by Maciej Wereski. Fixes #1247.
Diffstat (limited to 'Makefile-man.am')
-rw-r--r--Makefile-man.am5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile-man.am b/Makefile-man.am
index 14c2b7d57e..1ff85d7d2c 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -355,6 +355,7 @@ MANPAGES_ALIAS += \
man/sd_journal_set_data_threshold.3 \
man/sd_journal_test_cursor.3 \
man/sd_journal_wait.3 \
+ man/sd_listen_fds_with_names.3 \
man/sd_machine_get_ifindices.3 \
man/sd_notifyf.3 \
man/sd_pid_notify.3 \
@@ -643,6 +644,7 @@ man/sd_journal_sendv.3: man/sd_journal_print.3
man/sd_journal_set_data_threshold.3: man/sd_journal_get_data.3
man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
man/sd_journal_wait.3: man/sd_journal_get_fd.3
+man/sd_listen_fds_with_names.3: man/sd_listen_fds.3
man/sd_machine_get_ifindices.3: man/sd_machine_get_class.3
man/sd_notifyf.3: man/sd_notify.3
man/sd_pid_notify.3: man/sd_notify.3
@@ -1319,6 +1321,9 @@ man/sd_journal_test_cursor.html: man/sd_journal_get_cursor.html
man/sd_journal_wait.html: man/sd_journal_get_fd.html
$(html-alias)
+man/sd_listen_fds_with_names.html: man/sd_listen_fds.html
+ $(html-alias)
+
man/sd_machine_get_ifindices.html: man/sd_machine_get_class.html
$(html-alias)