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.

diff --git a/Makefile.am b/Makefile.am
index 927d25f0856b45ca715e392d2f55388154930bec..ae775c8c39720879a5d30d835cb5a345a829f1c7 100644 (file)
--- 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 cfbcda2f65863070ef12766d08d547941090c627..ab2e50c22c42bc9f156c34e374bb113e6bdf1ecd 100644 (file)
--- 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