X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=fd08001254e929a4bf86b71b5883ee2fefa9b6eb;hb=189455ab08a70f0c80a11847b65ce38563b9332a;hp=ab7fca677a5165f0d91f257d7858be9e2b55a7a5;hpb=337eebb936be1da1215535e866965ce54c82d755;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index ab7fca677..fd0800125 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -225,7 +225,7 @@ rootlibexec_PROGRAMS = \
 	systemd-shutdownd \
 	systemd-shutdown \
 	systemd-modules-load \
-	systemd-remount-api-vfs \
+	systemd-remount-fs \
 	systemd-reply-password \
 	systemd-fsck \
 	systemd-timestamp \
@@ -287,7 +287,6 @@ dist_systemunit_DATA = \
 	units/sys-kernel-debug.mount \
 	units/sys-fs-fuse-connections.mount \
 	units/tmp.mount \
-	units/remount-rootfs.service \
 	units/printer.target \
 	units/sound.target \
 	units/bluetooth.target \
@@ -298,7 +297,8 @@ dist_systemunit_DATA = \
 	units/systemd-ask-password-console.path \
 	units/syslog.target \
 	units/systemd-udev-control.socket \
-	units/systemd-udev-kernel.socket
+	units/systemd-udev-kernel.socket \
+	units/systemd-timedated-ntp.target
 
 nodist_systemunit_DATA = \
 	units/getty@.service \
@@ -308,7 +308,7 @@ nodist_systemunit_DATA = \
 	units/systemd-initctl.service \
 	units/systemd-shutdownd.service \
 	units/systemd-modules-load.service \
-	units/systemd-remount-api-vfs.service \
+	units/systemd-remount-fs.service \
 	units/systemd-update-utmp-runlevel.service \
 	units/systemd-update-utmp-shutdown.service \
 	units/systemd-tmpfiles-setup.service \
@@ -345,7 +345,7 @@ EXTRA_DIST += \
 	units/systemd-initctl.service.in \
 	units/systemd-shutdownd.service.in \
 	units/systemd-modules-load.service.in \
-	units/systemd-remount-api-vfs.service.in \
+	units/systemd-remount-fs.service.in \
 	units/systemd-update-utmp-runlevel.service.in \
 	units/systemd-update-utmp-shutdown.service.in \
 	units/systemd-tmpfiles-setup.service.in \
@@ -904,7 +904,8 @@ test_job_type_CFLAGS = \
 	$(DBUS_CFLAGS)
 
 test_job_type_LDADD = \
-	libsystemd-core.la
+	libsystemd-core.la \
+	libsystemd-daemon.la
 
 test_ns_SOURCES = \
 	src/test/test-ns.c
@@ -1110,12 +1111,12 @@ systemd_rc_local_generator_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-systemd_remount_api_vfs_SOURCES = \
-	src/remount-api-vfs/remount-api-vfs.c \
+systemd_remount_fs_SOURCES = \
+	src/remount-fs/remount-fs.c \
 	src/core/mount-setup.c \
 	src/core/mount-setup.h
 
-systemd_remount_api_vfs_LDADD = \
+systemd_remount_fs_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -2888,6 +2889,7 @@ SED_PROCESS = \
 		-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
 		-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
 		-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
+		-e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \
 		-e 's,@prefix\@,$(prefix),g' \
 		-e 's,@exec_prefix\@,$(exec_prefix),g' \
 		-e 's,@libdir\@,$(libdir),g' \
@@ -3059,13 +3061,11 @@ systemd-install-data-hook:
 		rm -f systemd-update-utmp-shutdown.service && \
 		$(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
 	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-		rm -f systemd-remount-api-vfs.service \
+		rm -f systemd-remount-fs.service \
 			fsck-root.service \
-			remount-rootfs.service \
 			tmp.mount && \
-		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+		$(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
 		$(LN_S) ../fsck-root.service fsck-root.service && \
-		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
 		$(LN_S) ../tmp.mount tmp.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
 		rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
@@ -3166,10 +3166,6 @@ if TARGET_MEEGO
 endif
 
 if TARGET_FEDORA
-	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service single.service && \
 		$(LN_S) prefdm.service display-manager.service && \
@@ -3180,10 +3176,6 @@ if TARGET_FEDORA
 endif
 
 if TARGET_MANDRIVA
-	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service dm.service single.service && \
 		$(LN_S) prefdm.service display-manager.service && \
@@ -3201,20 +3193,12 @@ if TARGET_DEBIAN_OR_UBUNTU
 endif
 
 if TARGET_SUSE
-	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f local.service && \
 		$(LN_S) rc-local.service local.service )
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 endif
 
 if TARGET_MAGEIA
-	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service && \
 		$(LN_S) prefdm.service display-manager.service && \