On Thu, Mar 29, 2012 at 06:45:15PM +0200, Petr Uzel wrote:
> Implement --socket-activatoin option, which is supposed to be used
> with systemd (or equivalent init system) socket activation mechanism.
> With this option, the UUID daemon does not create the socket on its own,
> but instead expect the connection fd to be provided by the calling
> process.
>
> This option is only available if util-linux is configured with
> --enable-uuidd-socket-activation option. With this configure
> option, the uuidd is compiled with sd-daemon.c.
>
> Signed-off-by: Petr Uzel <petr.uzel@xxxxxxx>
> ---
> configure.ac | 12 +
> misc-utils/Makefile.am | 6 +
> misc-utils/sd-daemon.c | 530 ++++++++++++++++++++++++++++++++++++++++++++++++
> misc-utils/sd-daemon.h | 282 +++++++++++++++++++++++++
> misc-utils/uuidd.8 | 6 +
> misc-utils/uuidd.c | 89 ++++++--
> 6 files changed, 903 insertions(+), 22 deletions(-)
> create mode 100644 misc-utils/sd-daemon.c
> create mode 100644 misc-utils/sd-daemon.h
>
> diff --git a/configure.ac b/configure.ac
> index 2140bc5..bb56948 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1101,6 +1101,18 @@ if test "x$enable_login_chown_vcs" = xyes; then
> fi
>
>
> +AC_ARG_ENABLE([uuidd-socket-activation],
> + AS_HELP_STRING([--enable-uuidd-socket-activation], [build uuidd with support for systemd socket activation]),
> + [], enable_uuidd_socket_activation=no
> +)
What about --enable-socket-activation (without -uuidd-)?
If you have distro with systemd then all your stuff should compatible
with the initd (it's detail that currently we have one daemon only).
> +AM_CONDITIONAL(UUIDD_SOCKET_ACTIVATION, test "x$enable_uuidd_socket_activation" = xyes)
USE_SOCKET_ACTIVATION
> +if test "x$enable_uuidd_socket_activation" = xyes; then
> + AC_DEFINE(UUIDD_SOCKET_ACTIVATION, 1, [Should uuidd support socket activation?])
USE_SOCKET_ACTIVATION
[...]
> static void server_loop(const char *socket_path, const char *pidfile_path,
> - int debug, int timeout, int quiet, int no_fork)
> + int debug, int timeout, int quiet, int no_fork,
> + int no_sock)
hmm... pretty long argument lists :-)
Maybe use struct uuidd_cxt with bit array for all the arguments. If
yes, then use a separate patch for this change.
Karel
--
Karel Zak <kzak@xxxxxxxxxx>
http://karelzak.blogspot.com
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
