units: fix logger/initctl paths

diff --git a/Makefile.am b/Makefile.am
index 7afa2f1576c5df099b868442e545c755ee783194..d08644a6f95ec3941cd5121df753fa097c656809 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -246,10 +246,14 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 systemd-initctl.service: units/systemd-initctl.service.in Makefile
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 systemd-initctl.service: units/systemd-initctl.service.in Makefile

-       sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+       sed -e 's,@libexecdir\@,$(libexecdir),g' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+               < $< > $@

 
 systemd-logger.service: units/systemd-logger.service.in Makefile
 
 systemd-logger.service: units/systemd-logger.service.in Makefile

-       sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+       sed -e 's,@libexecdir\@,$(libexecdir),g' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+               < $< > $@

 
 CLEANFILES = \
        systemd-interfaces.c \
 
 CLEANFILES = \
        systemd-interfaces.c \

diff --git a/socket.c b/socket.c
index cb065b75bfeca5af7f7d31b2b34e6d403f9846f1..6d15cfe0e9e3f345f74009803559f803b56fbc5e 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -1110,7 +1110,6 @@ static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
                 }
         }
 
                 }
         }
 

-        log_debug("cfd=%i", cfd);

         socket_enter_running(s, cfd);
         return;
 
         socket_enter_running(s, cfd);
         return;
 

diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in
index 268cd9cf13852cfba6781230600b97da51a3f1fa..4fce847839c1ba48e118f9d4f5202c8acd50b0ca 100644 (file)
--- a/units/systemd-initctl.service.in
+++ b/units/systemd-initctl.service.in
@@ -2,5 +2,5 @@
 Description=systemd /dev/initctl Compatibility
 
 [Service]
 Description=systemd /dev/initctl Compatibility
 
 [Service]

-ExecStart=@libexecdir@/systemd-initctl
+ExecStart=@pkglibexecdir@/systemd-initctl

 Type=simple
 Type=simple

diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in
index fd0621abe740ce7f8c2d6bad039fff0dcce8d589..55f3841ed6efce3dae16163a9a771c12b7eee97d 100644 (file)
--- a/units/systemd-logger.service.in
+++ b/units/systemd-logger.service.in
@@ -2,5 +2,5 @@
 Description=systemd Logging Daemon
 
 [Service]
 Description=systemd Logging Daemon
 
 [Service]

-ExecStart=@libexecdir@/systemd-logger
+ExecStart=@pkglibexecdir@/systemd-logger

 Type=simple
 Type=simple