[systemd-devel] [PATCH] rpcbind: add support for systemd socket activation
chuck.lever at oracle.com
Wed Feb 1 11:59:53 PST 2012
On Feb 1, 2012, at 6:47 AM, Tom Gundersen wrote:
> Making rpcbind sockect activated will greatly simplify
> its integration in systemd systems. In essence, other services
> may now assume that rpcbind is always available, even during very
> early boot. This means that we no longer need to worry about any
> ordering dependencies.
> This is based on a patch originally posted by Lennart Poettering:
> That patch was not merged due to the lack of a shared library and
> as systemd was seen to be too Fedora specific.
> Systemd now provides a shared library, and it is shipped by defalt in
> OpenSUSE in addition to Fedora, and it is available in Debain, Gentoo,
> Arch, and others.
> This version of the patch has three changes from the original:
> * It uses the shared library.
> * It comes with unit files.
> * It is rebased on top of master.
> Please review the patch with "git show -b" or otherwise ignoring the
> whitespace changes, or it will be extremely difficult to read.
> Comments welcome.
> v2: correctly enable systemd code at compile time
> handle the case where not all the required sockets were supplied
> listen on udp/tcp port 111 in addition to /var/run/rpcbind.sock
> do not daemonize
> Original-patch-by: Lennart Poettering <lennart at poettering.net>
> Cc: Michal Schmidt <mschmidt at redhat.com>
> Cc: Steve Dickson <steved at redhat.com>
> Cc: systemd-devel at lists.freedesktop.org
> Acked-by: Cristian Rodríguez<crrodriguez at opensuse.org>
> Signed-off-by: Tom Gundersen <teg at jklm.no>
> What's the status on this?
> Lennart, does your ack still appl after my changes?
> Steve, any chance of applying this?
> If this is applied I have a couple of follow ups. In particular, I'd like to
> do the cleanup of init_transport that Jim suggested as a separate patch,
> as leaving the line-wraps alone makes this patch easier to read I think.
> Added Michal to cc as this patch should go a long way to sort out
> Makefile.am | 15 ++
> configure.in | 11 +
> src/rpcbind.c | 467 +++++++++++++++++++++++++-------------------
> systemd/.gitignore | 1 +
> systemd/rpcbind.service.in | 9 +
> systemd/rpcbind.socket | 12 ++
> 6 files changed, 316 insertions(+), 199 deletions(-)
> create mode 100644 systemd/.gitignore
> create mode 100644 systemd/rpcbind.service.in
> create mode 100644 systemd/rpcbind.socket
> diff --git a/Makefile.am b/Makefile.am
> index 9fa608e..194b467 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -38,6 +38,21 @@ rpcbind_SOURCES = \
> rpcbind_LDADD = $(TIRPC_LIBS)
> +if SYSTEMD
> +AM_CPPFLAGS += $(SYSTEMD_CFLAGS) -DSYSTEMD
> +rpcbind_LDADD += $(SYSTEMD_LIBS)
> +systemd/rpcbind.service: systemd/rpcbind.service.in Makefile
> + sed -e 's, at bindir\@,$(bindir),g' \
> + < $< > $@ || rm $@
> +systemdsystemunit_DATA = \
> + systemd/rpcbind.service \
> + systemd/rpcbind.socket
> rpcinfo_SOURCES = src/rpcinfo.c
> rpcinfo_LDADD = $(TIRPC_LIBS)
> diff --git a/configure.in b/configure.in
> index 2b67720..397d52d 100644
> --- a/configure.in
> +++ b/configure.in
If I do a "make distclean" I don't have a configure.in. Should you be patching configure.ac instead?
> @@ -29,6 +29,17 @@ AC_SUBST([rpcuser], [$with_rpcuser])
> PKG_CHECK_MODULES([TIRPC], [libtirpc])
> + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
> + , [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
> + if test "x$with_systemdsystemunitdir" != xno; then
> + AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
> + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon])
> + fi
> +AM_CONDITIONAL(SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
> AS_IF([test x$enable_libwrap = xyes], [
> AC_CHECK_LIB([wrap], [hosts_access], ,
> AC_MSG_ERROR([libwrap support requested but unable to find libwrap]))
More information about the systemd-devel