Add systemd socket activation support and systemd unit files.

Signed-off-by: Andrew Shadura <[email protected]>

Author: andrewshadura

Makefile

@@ -3,6 +3,17 @@ DESTDIR:=/
 BINDIR:=$(DESTDIR)/$(PREFIX)/sbin/
 MANDIR:=$(DESTDIR)/$(PREFIX)/share/man/man1/
 
+PKGCONFIG = pkg-config
+HAVE_PKGCONFIG = $(shell $(PKGCONFIG) --version 2>/dev/null || echo no)
+ifneq ($(HAVE_PKGCONFIG),no)
+HAVE_SYSTEMD = $(shell $(PKGCONFIG) --exists libsystemd && echo 1 || echo 0)
+ifeq ($(HAVE_SYSTEMD),1)
+CPPFLAGS += -DHAVE_SYSTEMD=1
+CFLAGS += $(shell $(PKGCONFIG) --cflags libsystemd)
+LDLIBS += $(shell $(PKGCONFIG) --libs libsystemd)
+endif
+endif
+
 VERSION:=$(shell cat version.inc)
 
 THD_COMPS := thd keystate trigger eventnames devices cmdsocket obey ignore uinput triggerparser

cmdsocket.c

@@ -15,13 +15,25 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
+#endif
+
 #include "devtag.h"
 #include "devices.h"
 #include "command.h"
 #include "cmdsocket.h"
 
 int bind_cmdsocket( char *name ) {
 	int cmd_fd;
+
+#ifdef HAVE_SYSTEMD
+	if (sd_listen_fds(0) == 1) {
+		fprintf(stderr, SD_DEBUG "Found socket passed from systemd\n");
+		return SD_LISTEN_FDS_START + 0;
+	}
+#endif
+
 	struct sockaddr_un addr;
 	/* remove any stale files */
 	struct stat sb;

systemd/triggerhappy.service

@@ -0,0 +1,7 @@
+[Unit]
+Description=triggerhappy global hotkey daemon
+After=local-fs.target
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/thd --triggers /etc/triggerhappy/triggers.d/ --socket /run/thd.socket

systemd/triggerhappy.socket

@@ -0,0 +1,5 @@
+[Socket]
+ListenStream=/run/thd.socket
+
+[Install]
+WantedBy=sockets.target

thd.c

@@ -24,6 +24,10 @@
 #include <pwd.h>
 #include <grp.h>
 
+#ifdef HAVE_SYSTEMD
+#include <systemd/sd-daemon.h>
+#endif
+
 #include "thd.h"
 #include "eventnames.h"
 #include "devices.h"
@@ -343,6 +347,10 @@ int start_readers(int argc, char *argv[], int start) {
 		}
 	}
 
+#ifdef HAVE_SYSTEMD
+	sd_notify(0, "READY=1");
+#endif
+
 	process_events();
 
 	return 0;