diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-14 18:33:57 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-09-14 18:33:57 -0400 |
| commit | 3c72c8d3ee67388336aca58c5afa3fb93a9c24c0 (patch) | |
| tree | d072df7fee0f5906fad88c08398b2fe887cbc064 /src/grp-utils/systemd-socket-activate | |
| parent | e51613a3291342c6006edda8783755fb8994fd75 (diff) | |
| parent | 6ba6ca19507add38549e07058c57489a8cd98cd1 (diff) | |
Merge branch 'notsystemd/postmove' into notsystemd/master
# Conflicts:
# src/grp-journal/systemd-journald/Makefile
# src/grp-login/systemd-logind/Makefile
# src/grp-machine/grp-import/systemd-export/Makefile
# src/grp-machine/grp-import/systemd-import/Makefile
# src/grp-machine/grp-import/systemd-pull/Makefile
# src/grp-machine/systemd-machined/Makefile
# src/grp-network/libnetworkd-core/Makefile
# src/grp-resolve/libbasic-dns/Makefile
# src/grp-resolve/systemd-resolved/Makefile
# src/grp-utils/systemd-path/Makefile
# src/libshared/src/Makefile
# src/libsystemd-network/include/systemd-network/sd-ndisc.h
# src/libsystemd/Makefile
# src/libsystemd/src/test.mk
# src/libudev/Makefile
# src/systemd-dbus1-generator/Makefile
# src/systemd-nspawn/nspawn.c
Signed-off-by: Luke Shumaker <lukeshu@sbcglobal.net>
Diffstat (limited to 'src/grp-utils/systemd-socket-activate')
| -rw-r--r-- | src/grp-utils/systemd-socket-activate/Makefile | 2 | ||||
| -rw-r--r-- | src/grp-utils/systemd-socket-activate/systemd-socket-activate.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/grp-utils/systemd-socket-activate/Makefile b/src/grp-utils/systemd-socket-activate/Makefile index da1a1a5e43..dd3e95a5e8 100644 --- a/src/grp-utils/systemd-socket-activate/Makefile +++ b/src/grp-utils/systemd-socket-activate/Makefile @@ -30,6 +30,6 @@ systemd_socket_activate_SOURCES = \ src/activate/activate.c systemd_socket_activate_LDADD = \ - libshared.la + libsystemd-shared.la include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-utils/systemd-socket-activate/systemd-socket-activate.xml b/src/grp-utils/systemd-socket-activate/systemd-socket-activate.xml index 5d7f157c72..2cf3a7d377 100644 --- a/src/grp-utils/systemd-socket-activate/systemd-socket-activate.xml +++ b/src/grp-utils/systemd-socket-activate/systemd-socket-activate.xml @@ -142,7 +142,7 @@ <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 + (<literal>:</literal>) in one option. In case more names are given than descriptors, superfluous ones willl be ignored. In case less names are given than descriptors, the remaining file descriptors will be unnamed. </para></listitem> </varlistentry> |