diff options
| author | Karel Zak | 2014-04-09 12:23:30 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-04-09 12:23:30 +0200 |
| commit | ebff016a19b655ff8c087c3cbe42cb8061cc8f97 (patch) | |
| tree | 1eae1278c9711d79e53d90e966b961034c57f106 /misc-utils/uuidd.c | |
| parent | build-sys: fix fstrim systemd stuff (diff) | |
| download | kernel-qcow2-util-linux-ebff016a19b655ff8c087c3cbe42cb8061cc8f97.tar.gz kernel-qcow2-util-linux-ebff016a19b655ff8c087c3cbe42cb8061cc8f97.tar.xz kernel-qcow2-util-linux-ebff016a19b655ff8c087c3cbe42cb8061cc8f97.zip | |
build-sys: consolidate systemd support
* systemd (since v209) uses only one library (when compiled
without --enable-compat-libs)
* all systemd build-sys stuff is merged into HAVE_SYSTEMD
(automake) and HAVE_LIBSYSTEMD (C macro) now
* all is controlled by --with-systemd, default is to automatically
check for systemd libs
* no more --enable-socket-activation and --enable-journald
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 dd399631a..c62610509 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 HAVE_LIBSYSTEMD_DAEMON -#include <systemd/sd-daemon.h> +#ifdef HAVE_LIBSYSTEMD +# 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 HAVE_LIBSYSTEMD_DAEMON +#ifdef HAVE_LIBSYSTEMD 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 HAVE_LIBSYSTEMD_DAEMON +#ifdef HAVE_LIBSYSTEMD 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 HAVE_LIBSYSTEMD_DAEMON +#ifdef HAVE_LIBSYSTEMD uuidd_cxt.no_sock = 1; uuidd_cxt.no_fork = 1; no_pid = 1; |