From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 24 Aug 2012 21:23:08 +0000 (+0200)
Subject: journal: don't pull in flush service from journald service
X-Git-Tag: v190~183
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ddffe892464b95630f2e1c9c6eefd6d30d36dec2

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 927d25f08..ae775c8c3 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 cfbcda2f6..ab2e50c22 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