picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

units: fix logger/initctl paths

This commit is contained in:
Lennart Poettering 2010-04-23 22:18:55 +02:00
parent cabab516b3
commit 2d02719c2b
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -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
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
sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
sed -e 's,@libexecdir\@,$(libexecdir),g' \
-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
< $< > $@
CLEANFILES = \
systemd-interfaces.c \

1
socket.c
View File

@ -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;

2
units/systemd-initctl.service.in
View File

@ -2,5 +2,5 @@
Description=systemd /dev/initctl Compatibility
[Service]
ExecStart=@libexecdir@/systemd-initctl
ExecStart=@pkglibexecdir@/systemd-initctl
Type=simple

2
units/systemd-logger.service.in
View File

@ -2,5 +2,5 @@
Description=systemd Logging Daemon
[Service]
ExecStart=@libexecdir@/systemd-logger
ExecStart=@pkglibexecdir@/systemd-logger
Type=simple