diff options
| author | Sami Kerola | 2014-01-07 00:39:08 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-01-07 12:17:37 +0100 |
| commit | ea45d34c7c8e2c9017c3e0ee57c202928157a482 (patch) | |
| tree | 8a543ef4c045d7992efa509e012627f67d63d105 /misc-utils/uuidd.c | |
| parent | unshare: Add possibility to add mapping into root user in user namespace (diff) | |
| download | kernel-qcow2-util-linux-ea45d34c7c8e2c9017c3e0ee57c202928157a482.tar.gz kernel-qcow2-util-linux-ea45d34c7c8e2c9017c3e0ee57c202928157a482.tar.xz kernel-qcow2-util-linux-ea45d34c7c8e2c9017c3e0ee57c202928157a482.zip | |
uuidd: use pkg-config to find systemd-deamon support
[kzak@redhat.com: - remove USE_SOCKET_ACTIVATION and use
HAVE_* as we use for another libs]
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/uuidd.c')
| -rw-r--r-- | misc-utils/uuidd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c index d381eea9e..dd399631a 100644 --- a/misc-utils/uuidd.c +++ b/misc-utils/uuidd.c @@ -38,8 +38,8 @@ extern int optind; #include "closestream.h" #include "strutils.h" -#ifdef USE_SOCKET_ACTIVATION -#include "sd-daemon.h" +#ifdef HAVE_LIBSYSTEMD_DAEMON +#include <systemd/sd-daemon.h> #endif #include "nls.h" @@ -304,7 +304,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path, int fd_pidfile = -1; int ret; -#ifdef USE_SOCKET_ACTIVATION +#ifdef HAVE_LIBSYSTEMD_DAEMON if (!uuidd_cxt->no_sock) /* no_sock implies no_fork and no_pid */ #endif { @@ -352,7 +352,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path, signal(SIGALRM, terminate_intr); signal(SIGPIPE, SIG_IGN); -#ifdef USE_SOCKET_ACTIVATION +#ifdef HAVE_LIBSYSTEMD_DAEMON if (uuidd_cxt->no_sock) { if (sd_listen_fds(0) != 1) errx(EXIT_FAILURE, _("no or too many file descriptors received")); @@ -538,7 +538,7 @@ int main(int argc, char **argv) uuidd_cxt.no_fork = 1; break; case 'S': -#ifdef USE_SOCKET_ACTIVATION +#ifdef HAVE_LIBSYSTEMD_DAEMON uuidd_cxt.no_sock = 1; uuidd_cxt.no_fork = 1; no_pid = 1; |