diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-08-24 23:23:08 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-09-03 18:59:05 -0700 |
| commit | ddffe892464b95630f2e1c9c6eefd6d30d36dec2 (patch) | |
| tree | 34bd3f619b19f1fef6688edef290ec7c07ecc61b | |
| parent | 7e75c5ac2d607bd87818d1a3546ff6ae5c6c3859 (diff) | |
journal: don't pull in flush service from journald service
In the initrd we don't need the flush service hence don't attempt to
pull it in.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | units/systemd-journald.service.in | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 927d25f085..ae775c8c39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2575,8 +2575,9 @@ journal-install-data-hook: rm -f systemd-journald.socket && \ $(LN_S) ../systemd-journald.socket ) ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ - rm -f systemd-journald.service && \ - $(LN_S) ../systemd-journald.service ) + rm -f systemd-journald.service systemd-journal-flush.service && \ + $(LN_S) ../systemd-journald.service && \ + $(LN_S) ../systemd-journal-flush.service ) INSTALL_DATA_HOOKS += \ journal-install-data-hook diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in index cfbcda2f65..ab2e50c22c 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -9,7 +9,6 @@ Description=Journal Service Documentation=man:systemd-journald.service(8) man:journald.conf(5) DefaultDependencies=no -Wants=systemd-journal-flush.service Requires=systemd-journald.socket After=systemd-journald.socket syslog.socket Before=sysinit.target |