units: fix logger/initctl paths
This commit is contained in:
parent
cabab516b3
commit
2d02719c2b
|
@ -246,10 +246,14 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
|
||||||
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
|
systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
|
||||||
|
|
||||||
systemd-initctl.service: units/systemd-initctl.service.in Makefile
|
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 = \
|
CLEANFILES = \
|
||||||
systemd-interfaces.c \
|
systemd-interfaces.c \
|
||||||
|
|
1
socket.c
1
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);
|
socket_enter_running(s, cfd);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
Description=systemd /dev/initctl Compatibility
|
Description=systemd /dev/initctl Compatibility
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=@libexecdir@/systemd-initctl
|
ExecStart=@pkglibexecdir@/systemd-initctl
|
||||||
Type=simple
|
Type=simple
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
Description=systemd Logging Daemon
|
Description=systemd Logging Daemon
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=@libexecdir@/systemd-logger
|
ExecStart=@pkglibexecdir@/systemd-logger
|
||||||
Type=simple
|
Type=simple
|
||||||
|
|
Loading…
Reference in a new issue