diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-04-23 22:18:55 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-04-23 22:18:55 +0200 |
| commit | 2d02719c2bcf8b5e30228e00eaceae91946c7551 (patch) | |
| tree | 84db5f109e63685e9da9f96f5e2dc8a6e81335b2 | |
| parent | cabab516b38fbb2146bb62980b6770b1f70403fa (diff) | |
units: fix logger/initctl paths
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | socket.c | 1 | ||||
| -rw-r--r-- | units/systemd-initctl.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-logger.service.in | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 7afa2f1576..d08644a6f9 100644 --- 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 - 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 \ @@ -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; diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in index 268cd9cf13..4fce847839 100644 --- a/units/systemd-initctl.service.in +++ b/units/systemd-initctl.service.in @@ -2,5 +2,5 @@ Description=systemd /dev/initctl Compatibility [Service] -ExecStart=@libexecdir@/systemd-initctl +ExecStart=@pkglibexecdir@/systemd-initctl Type=simple diff --git a/units/systemd-logger.service.in b/units/systemd-logger.service.in index fd0621abe7..55f3841ed6 100644 --- a/units/systemd-logger.service.in +++ b/units/systemd-logger.service.in @@ -2,5 +2,5 @@ Description=systemd Logging Daemon [Service] -ExecStart=@libexecdir@/systemd-logger +ExecStart=@pkglibexecdir@/systemd-logger Type=simple |