rpms/dhcp
5
0
Fork 0
Code Issues Pull Requests Releases Activity

dhcp-sd-daemon.patch: sd_notifyf() moved from libsystemd-daemon to libsystemd

Browse Source
This commit is contained in:
Jiri Popelka 2014-05-29 15:41:43 +02:00
parent 4533a8a170
commit 3dbffba559
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dhcp-sd-daemon.patch
View File

@ -12,8 +12,8 @@ diff -up dhcp-4.3.0/configure.ac.sd-daemon dhcp-4.3.0/configure.ac
+ [systemd=no]) + [systemd=no])
+ +
+if test x$systemd = xyes ; then +if test x$systemd = xyes ; then
+ AC_CHECK_LIB(systemd-daemon, sd_notify, , + AC_CHECK_LIB(systemd, sd_notifyf, ,
+ AC_MSG_FAILURE([*** sd-daemon library not present - do you need to install systemd-libs package?])) + AC_MSG_FAILURE([*** systemd library not present - do you need to install systemd-libs package?]))
+fi +fi
+ +
# Append selected warning levels to CFLAGS before substitution (but after # Append selected warning levels to CFLAGS before substitution (but after
@ -26,7 +26,7 @@ diff -up dhcp-4.3.0/relay/dhcrelay.c.sd-daemon dhcp-4.3.0/relay/dhcrelay.c
int keep_capabilities = 0; int keep_capabilities = 0;
#endif #endif
+#ifdef HAVE_LIBSYSTEMD_DAEMON +#ifdef HAVE_LIBSYSTEMD
+#include <systemd/sd-daemon.h> +#include <systemd/sd-daemon.h>
+#endif +#endif
+ +
@ -37,7 +37,7 @@ diff -up dhcp-4.3.0/relay/dhcrelay.c.sd-daemon dhcp-4.3.0/relay/dhcrelay.c
} }
#endif #endif
+#ifdef HAVE_LIBSYSTEMD_DAEMON +#ifdef HAVE_LIBSYSTEMD
+ /* We are ready to process incomming packets. Let's notify systemd */ + /* We are ready to process incomming packets. Let's notify systemd */
+ sd_notifyf(0, "READY=1\n" + sd_notifyf(0, "READY=1\n"
+ "STATUS=Dispatching packets...\n" + "STATUS=Dispatching packets...\n"
@ -55,7 +55,7 @@ diff -up dhcp-4.3.0/server/dhcpd.c.sd-daemon dhcp-4.3.0/server/dhcpd.c
#include "trace.h" #include "trace.h"
+#ifdef HAVE_LIBSYSTEMD_DAEMON +#ifdef HAVE_LIBSYSTEMD
+#include <systemd/sd-daemon.h> +#include <systemd/sd-daemon.h>
+#endif +#endif
+ +
@ -66,7 +66,7 @@ diff -up dhcp-4.3.0/server/dhcpd.c.sd-daemon dhcp-4.3.0/server/dhcpd.c
TRACE(DHCPD_MAIN()); TRACE(DHCPD_MAIN());
+#ifdef HAVE_LIBSYSTEMD_DAEMON +#ifdef HAVE_LIBSYSTEMD
+ /* We are ready to process incomming packets. Let's notify systemd */ + /* We are ready to process incomming packets. Let's notify systemd */
+ sd_notifyf(0, "READY=1\n" + sd_notifyf(0, "READY=1\n"
+ "STATUS=Dispatching packets...\n" + "STATUS=Dispatching packets...\n"