parent
3a6a164fff
commit
fb142540b5
@ -0,0 +1,50 @@
|
||||
From 46e2156480cd1a618079233bc0926dee2ae23e9a Mon Sep 17 00:00:00 2001
|
||||
From: Alec Leamas <leamas.alec@gmail.com>
|
||||
Date: Tue, 4 Apr 2017 10:31:26 +0200
|
||||
Subject: [PATCH] Fix missing socket activation
|
||||
|
||||
---
|
||||
configure.ac | 2 ++
|
||||
daemons/lircd.cpp | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 08e2c8e..d032365 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -385,6 +385,7 @@ AC_CHECK_HEADERS(linux/i2c-dev.h,[
|
||||
|
||||
|
||||
PKG_CHECK_MODULES([SYSTEMD],[libsystemd-daemon],,[true])
|
||||
+test -n "$SYSTEMD_LIBS" || PKG_CHECK_MODULES([SYSTEMD],[libsystemd],,[true])
|
||||
if test -n "$SYSTEMD_LIBS"; then
|
||||
CFLAGS="$CFLAGS $SYSTEMD_CFLAGS"
|
||||
AC_DEFINE(HAVE_SYSTEMD)
|
||||
@@ -530,6 +531,7 @@ AC_REPORT_CONDITIONAL([NEED_PYTHON3])
|
||||
AC_REPORT_CONDITIONAL([SYSTEMD_INSTALL])
|
||||
AC_REPORT_CONDITIONAL([DEVEL])
|
||||
AC_REPORT_CONDITIONAL([HAVE_UINPUT])
|
||||
+AC_REPORT_CONDITIONAL([HAVE_SYSTEMD])
|
||||
AC_REPORT_CONDITIONAL([DARWIN])
|
||||
AC_REPORT_CONDITIONAL([BSD])
|
||||
|
||||
diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
|
||||
index 69331b1..652afdc 100644
|
||||
--- a/daemons/lircd.cpp
|
||||
+++ b/daemons/lircd.cpp
|
||||
@@ -1035,10 +1035,12 @@ void start_server(mode_t permission, int nodaemon, loglevel_t loglevel)
|
||||
fprintf(stderr, "Too many file descriptors received.\n");
|
||||
goto start_server_failed0;
|
||||
} else if (n == 1) {
|
||||
+ log_notice("Using systemd fd");
|
||||
sockfd = SD_LISTEN_FDS_START + 0;
|
||||
}
|
||||
#endif
|
||||
if (sockfd == -1) {
|
||||
+ log_debug("No systemd fd found");
|
||||
sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
|
||||
if (sockfd == -1) {
|
||||
perror("Could not create socket");
|
||||
--
|
||||
2.9.3
|
||||
|
Loading…
Reference in new issue