X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=370a3c6ce9169b536e9100a72c2d9e23ff07b791;hb=15917fb09b669021d1f20ddc1f468d156b05a8e0;hp=2cd3debf83934d11ba00a26367b41c8d8b15b62c;hpb=22be093ffb403a1c474037939ca9b88b1ee39f77;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 2cd3debf8..370a3c6ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,7 +94,8 @@ rootlibexec_PROGRAMS = \
 	systemd-vconsole-setup \
 	systemd-reply-password \
 	systemd-readahead-collect \
-	systemd-readahead-replay
+	systemd-readahead-replay \
+	systemd-tempfiles
 
 noinst_PROGRAMS = \
 	test-engine \
@@ -208,6 +209,8 @@ nodist_systemunit_DATA = \
 	units/systemd-update-utmp-shutdown.service \
 	units/systemd-random-seed-save.service \
 	units/systemd-random-seed-load.service \
+	units/systemd-readahead-collect.service \
+	units/systemd-readahead-replay.service \
 	units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -235,6 +238,8 @@ EXTRA_DIST = \
 	units/systemd-update-utmp-shutdown.service.in \
 	units/systemd-random-seed-save.service.in \
 	units/systemd-random-seed-load.service.in \
+	units/systemd-readahead-collect.service.in \
+	units/systemd-readahead-replay.service.in \
 	units/syslog.target.in \
 	units/session/exit.service.in \
 	systemd.pc.in
@@ -421,6 +426,7 @@ MANPAGES = \
 	man/systemd-cgls.1 \
 	man/systemd-notify.1 \
 	man/sd_notify.3 \
+	man/sd_readahead.3 \
 	man/sd_booted.3 \
 	man/sd_listen_fds.3 \
 	man/sd_is_fifo.3 \
@@ -619,6 +625,15 @@ systemd_modules_load_SOURCES = \
 systemd_modules_load_CFLAGS = \
 	$(AM_CFLAGS)
 
+systemd_tempfiles_LDADD = \
+	libsystemd-basic.la
+
+systemd_tempfiles_SOURCES = \
+	src/tempfiles.c
+
+systemd_tempfiles_CFLAGS = \
+	$(AM_CFLAGS)
+
 systemd_modules_load_LDADD = \
 	libsystemd-basic.la
 
@@ -930,7 +945,7 @@ install-data-hook:
 		$(DESTDIR)$(systemunitdir) \
 		$(DESTDIR)$(sessionunitdir) \
 		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
-		$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+		$(DESTDIR)$(systemunitdir)/basic.target.wants \
 		$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
 		$(DESTDIR)$(systemunitdir)/local-fs.target.wants \
 		$(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
@@ -976,10 +991,17 @@ install-data-hook:
 		$(LN_S) ../hwclock-save.service hwclock-save.service && \
 		$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
 	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-		rm -f systemd-update-utmp-shutdown.service \
+		rm -f systemd-remount-api-vfs.service \
+			remount-rootfs.service \
+			var-run.mount \
 			var-run.service \
+			var-lock.mount \
 			var-lock.service && \
+		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
+		$(LN_S) ../var-run.mount var-run.mount && \
 		$(LN_S) ../var-run.service var-run.service && \
+		$(LN_S) ../var-lock.mount var-lock.mount && \
 		$(LN_S) ../var-lock.service var-lock.service )
 	( cd $(DESTDIR)$(sessionunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
@@ -1016,7 +1038,7 @@ install-data-hook:
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
 		rm -f remote-fs.target && \
 		$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
-	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
 		rm -f dev-hugepages.automount \
 			dev-mqueue.automount \
 			proc-sys-fs-binfmt_misc.automount \
@@ -1124,3 +1146,10 @@ upload: all distcheck
 
 git-tag:
 	git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
+fedora: install
+	rm /lib/systemd/system/local-fs.target.wants/var-run.service
+	rm /lib/systemd/system/local-fs.target.wants/var-run.mount
+	rm /lib/systemd/system/local-fs.target.wants/var-lock.service
+	rm /lib/systemd/system/local-fs.target.wants/var-lock.mount