X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4caa2433b1ce6e6b10b79c660d60928b30c7220c;hp=e1f6fe058e7a10ef42bab874eb76916d4ea38211;hb=1de4d79bf554946f486adf56ed765c5335816f15;hpb=b1a2da0a7917fed1fbbc51ef7562b4db92c715f6

diff --git a/Makefile.am b/Makefile.am
index e1f6fe058..4caa2433b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
 systemgeneratordir=$(rootdir)/lib/systemd/system-generators
+systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
@@ -62,6 +63,7 @@ AM_CPPFLAGS = \
 	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
 	-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
 	-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
+	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
 	-I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -76,19 +78,35 @@ AM_CPPFLAGS += \
 	-DKBD_SETFONT=\"/usr/bin/setfont\" \
 	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_FRUGALWARE
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
+if TARGET_MANDRIVA
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
 	-DKBD_SETFONT=\"/bin/setfont\" \
 	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
 endif
 endif
+endif
+endif
 
 rootbin_PROGRAMS = \
 	systemd \
 	systemctl \
 	systemd-notify \
 	systemd-ask-password \
-	systemd-tty-ask-password-agent
+	systemd-tty-ask-password-agent \
+	systemd-tmpfiles \
+	systemd-machine-id-setup
 
 bin_PROGRAMS = \
 	systemd-cgls
@@ -114,12 +132,12 @@ rootlibexec_PROGRAMS = \
 	systemd-reply-password \
 	systemd-readahead-collect \
 	systemd-readahead-replay \
-	systemd-tmpfiles \
 	systemd-user-sessions \
 	systemd-fsck \
 	systemd-quotacheck \
 	systemd-timestamp \
 	systemd-ac-power \
+	systemd-detect-virt \
 	systemd-sysctl
 
 if HAVE_LIBCRYPTSETUP
@@ -222,17 +240,18 @@ dist_systemunit_DATA = \
 	units/sys-kernel-security.mount \
 	units/var-lock.mount \
 	units/var-run.mount \
+	units/media.mount \
 	units/hwclock-load.service \
 	units/hwclock-save.service \
 	units/remount-rootfs.service \
 	units/printer.target \
+	units/sound.target \
 	units/bluetooth.target \
 	units/smartcard.target \
 	units/systemd-readahead-done.timer \
 	units/systemd-tmpfiles-clean.timer \
 	units/quotaon.service \
 	units/systemd-ask-password-wall.path \
-	units/systemd-ask-password-plymouth.path \
 	units/systemd-ask-password-console.path
 
 nodist_systemunit_DATA = \
@@ -259,7 +278,6 @@ nodist_systemunit_DATA = \
 	units/systemd-tmpfiles-clean.service \
 	units/systemd-user-sessions.service \
 	units/systemd-ask-password-wall.service \
-	units/systemd-ask-password-plymouth.service \
 	units/systemd-ask-password-console.service \
 	units/systemd-sysctl.service \
 	units/syslog.target \
@@ -305,7 +323,6 @@ EXTRA_DIST = \
 	units/systemd-tmpfiles-clean.service.in \
 	units/systemd-user-sessions.service.in \
 	units/systemd-ask-password-wall.service.in \
-	units/systemd-ask-password-plymouth.service.in \
 	units/systemd-ask-password-console.service.in \
 	units/systemd-sysctl.service.in \
 	units/syslog.target.in \
@@ -317,30 +334,40 @@ EXTRA_DIST = \
 	units/fsck@.service.in \
 	units/fsck-root.service.in \
 	units/quotacheck.service.in \
-	systemd.pc.in
+	systemd.pc.in \
+	introspect.awk
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
 	units/fedora/prefdm.service \
 	units/fedora/rc-local.service \
-	units/fedora/halt-local.service \
-	units/fedora/plymouth-start.service \
-	units/fedora/plymouth-read-write.service \
-	units/fedora/plymouth-quit.service \
-	units/fedora/plymouth-reboot.service \
-	units/fedora/plymouth-kexec.service \
-	units/fedora/plymouth-poweroff.service \
-	units/fedora/plymouth-halt.service
+	units/fedora/halt-local.service
 endif
 
-if TARGET_GENTOO
+if TARGET_MANDRIVA
 dist_systemunit_DATA += \
-	units/gentoo/xdm.service
+	units/mandriva/prefdm.service \
+	units/fedora/rc-local.service \
+	units/fedora/halt-local.service
 endif
 
-if TARGET_ARCH
+if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
-	units/arch/rc-local.service
+	units/plymouth-start.service \
+	units/plymouth-read-write.service \
+	units/plymouth-quit.service \
+	units/plymouth-quit-wait.service \
+	units/plymouth-reboot.service \
+	units/plymouth-kexec.service \
+	units/plymouth-poweroff.service \
+	units/plymouth-halt.service \
+	units/systemd-ask-password-plymouth.path
+
+nodist_systemunit_DATA += \
+	units/systemd-ask-password-plymouth.service
+
+EXTRA_DIST += \
+	units/systemd-ask-password-plymouth.service.in
 endif
 
 dist_doc_DATA = \
@@ -360,7 +387,8 @@ dist_polkitpolicy_DATA = \
 
 noinst_LTLIBRARIES = \
 	libsystemd-basic.la \
-	libsystemd-core.la
+	libsystemd-core.la \
+	libsystemd-daemon.la
 
 libsystemd_basic_la_SOURCES = \
 	src/util.c \
@@ -371,7 +399,8 @@ libsystemd_basic_la_SOURCES = \
 	src/conf-parser.c \
 	src/socket-util.c \
 	src/log.c \
-	src/ratelimit.c
+	src/ratelimit.c \
+	src/exit-status.c
 
 libsystemd_basic_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -399,7 +428,6 @@ libsystemd_core_la_SOURCES = \
 	src/load-dropin.c \
 	src/execute.c \
 	src/utmp-wtmp.c \
-	src/exit-status.c \
 	src/dbus.c \
 	src/dbus-manager.c \
 	src/dbus-unit.c \
@@ -422,6 +450,7 @@ libsystemd_core_la_SOURCES = \
 	src/loopback-setup.c \
 	src/kmod-setup.c \
 	src/locale-setup.c \
+	src/machine-id-setup.c \
 	src/specifier.c \
 	src/unit-name.c \
 	src/fdset.c \
@@ -446,6 +475,9 @@ libsystemd_core_la_LIBADD = \
 	$(PAM_LIBS) \
 	$(AUDIT_LIBS)
 
+libsystemd_daemon_la_SOURCES = \
+	src/sd-daemon.c
+
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
 # list the .h files as dependencies if we want make dist to work.
@@ -453,6 +485,7 @@ libsystemd_core_la_LIBADD = \
 EXTRA_DIST += \
 	${libsystemd_basic_la_SOURCES:.c=.h} \
 	${libsystemd_core_la_SOURCES:.c=.h} \
+	${libsystemd_daemon_la_SOURCES:.c=.h} \
 	src/macro.h \
 	src/ioprio.h \
 	src/missing.h \
@@ -461,7 +494,6 @@ EXTRA_DIST += \
 	src/linux/auto_dev-ioctl.h \
 	src/linux/fanotify.h \
 	src/initreq.h \
-	src/sd-daemon.h \
 	src/sd-readahead.h \
 	src/special.h \
 	src/dbus-common.h \
@@ -478,6 +510,7 @@ MANPAGES = \
 	man/systemctl.1 \
 	man/systemadm.1 \
 	man/systemd-cgls.1 \
+	man/systemd-tmpfiles.8 \
 	man/systemd-notify.1 \
 	man/sd_notify.3 \
 	man/sd_readahead.3 \
@@ -505,7 +538,13 @@ MANPAGES = \
 	man/shutdown.8 \
 	man/pam_systemd.8 \
 	man/systemd.conf.5 \
-	man/tmpfiles.d.5
+	man/tmpfiles.d.5 \
+	man/hostname.5 \
+	man/machine-id.5 \
+	man/vconsole.conf.5 \
+	man/locale.conf.5 \
+	man/os-release.5 \
+	man/modules-load.d.5
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -593,11 +632,11 @@ test_hostname_LDADD = \
 	libsystemd-basic.la
 
 test_daemon_SOURCES = \
-	src/test-daemon.c \
-	src/sd-daemon.c
+	src/test-daemon.c
 
 test_daemon_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-daemon.la
 
 test_cgroup_SOURCES = \
 	src/test-cgroup.c \
@@ -619,7 +658,8 @@ test_env_replace_LDADD = \
 	libsystemd-basic.la
 
 test_strv_SOURCES = \
-	src/test-strv.c
+	src/test-strv.c \
+	src/specifier.c
 
 test_strv_CFLAGS = \
 	$(AM_CFLAGS)
@@ -629,16 +669,15 @@ test_strv_LDADD = \
 
 systemd_logger_SOURCES = \
 	src/logger.c \
-	src/sd-daemon.c \
 	src/tcpwrap.c
 
 systemd_logger_LDADD = \
 	libsystemd-basic.la \
+	libsystemd-daemon.la \
 	$(LIBWRAP_LIBS)
 
 systemd_initctl_SOURCES = \
 	src/initctl.c \
-	src/sd-daemon.c \
 	src/dbus-common.c
 
 systemd_initctl_CFLAGS = \
@@ -647,6 +686,7 @@ systemd_initctl_CFLAGS = \
 
 systemd_initctl_LDADD = \
 	libsystemd-basic.la \
+	libsystemd-daemon.la \
 	$(DBUS_LIBS)
 
 systemd_update_utmp_SOURCES = \
@@ -675,14 +715,14 @@ systemd_random_seed_LDADD = \
 
 systemd_shutdownd_SOURCES = \
 	src/utmp-wtmp.c \
-	src/sd-daemon.c \
 	src/shutdownd.c
 
 systemd_shutdownd_CFLAGS = \
 	$(AM_CFLAGS)
 
 systemd_shutdownd_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-daemon.la
 
 systemd_shutdown_SOURCES = \
 	src/mount-setup.c \
@@ -715,6 +755,16 @@ systemd_tmpfiles_CFLAGS = \
 systemd_tmpfiles_LDADD = \
 	libsystemd-basic.la
 
+systemd_machine_id_setup_SOURCES = \
+	src/machine-id-setup.c \
+	src/machine-id-main.c
+
+systemd_machine_id_setup_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_machine_id_setup_LDADD = \
+	libsystemd-basic.la
+
 systemd_sysctl_SOURCES = \
 	src/sysctl.c
 
@@ -767,6 +817,15 @@ systemd_ac_power_LDADD = \
 	libsystemd-basic.la \
 	$(UDEV_LIBS)
 
+systemd_detect_virt_SOURCES = \
+	src/detect-virt.c
+
+systemd_detect_virt_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_detect_virt_LDADD = \
+	libsystemd-basic.la
+
 systemd_cryptsetup_SOURCES = \
 	src/cryptsetup.c \
 	src/ask-password-api.c
@@ -812,7 +871,8 @@ systemd_vconsole_setup_LDADD = \
 
 systemd_remount_api_vfs_SOURCES = \
 	src/remount-api-vfs.c \
-	src/mount-setup.c
+	src/mount-setup.c \
+	src/exit-status.c
 
 systemd_remount_api_vfs_CFLAGS = \
 	$(AM_CFLAGS)
@@ -834,21 +894,20 @@ systemd_cgroups_agent_LDADD = \
 
 systemd_kmsg_syslogd_SOURCES = \
 	src/kmsg-syslogd.c \
-	src/sd-daemon.c \
 	src/fdset.c
 
 systemd_kmsg_syslogd_CFLAGS = \
 	$(AM_CFLAGS)
 
 systemd_kmsg_syslogd_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-daemon.la
 
 systemctl_SOURCES = \
 	src/systemctl.c \
 	src/utmp-wtmp.c \
 	src/dbus-common.c \
 	src/path-lookup.c \
-	src/sd-daemon.c \
 	src/cgroup-show.c \
 	src/cgroup-util.c \
 	src/exit-status.c \
@@ -860,15 +919,16 @@ systemctl_CFLAGS = \
 
 systemctl_LDADD = \
 	libsystemd-basic.la \
+	libsystemd-daemon.la \
 	$(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
 	src/notify.c \
-	src/sd-daemon.c \
 	src/sd-readahead.c
 
 systemd_notify_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-daemon.la
 
 systemd_ask_password_SOURCES = \
 	src/ask-password.c \
@@ -885,7 +945,6 @@ systemd_reply_password_LDADD = \
 
 systemd_readahead_collect_SOURCES = \
 	src/readahead-collect.c \
-	src/sd-daemon.c \
 	src/readahead-common.c
 
 systemd_readahead_collect_CFLAGS = \
@@ -893,11 +952,11 @@ systemd_readahead_collect_CFLAGS = \
 
 systemd_readahead_collect_LDADD = \
 	libsystemd-basic.la \
+	libsystemd-daemon.la \
 	$(UDEV_LIBS)
 
 systemd_readahead_replay_SOURCES = \
 	src/readahead-replay.c \
-	src/sd-daemon.c \
 	src/readahead-common.c
 
 systemd_readahead_replay_CFLAGS = \
@@ -905,6 +964,7 @@ systemd_readahead_replay_CFLAGS = \
 
 systemd_readahead_replay_LDADD = \
 	libsystemd-basic.la \
+	libsystemd-daemon.la \
 	$(UDEV_LIBS)
 
 systemd_cgls_SOURCES = \
@@ -924,7 +984,6 @@ systemadm_SOURCES = \
 
 systemadm_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUSGLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
 	-Wno-unused-variable \
 	-Wno-unused-function \
@@ -932,13 +991,11 @@ systemadm_CFLAGS = \
 	-Wno-format-nonliteral
 
 systemadm_VALAFLAGS = \
-	--pkg=dbus-glib-1 \
 	--pkg=posix \
 	--pkg=gtk+-2.0 \
 	-g
 
 systemadm_LDADD = \
-	$(DBUSGLIB_LIBS) \
 	$(GTK_LIBS)
 
 systemd_gnome_ask_password_agent_SOURCES = \
@@ -946,7 +1003,6 @@ systemd_gnome_ask_password_agent_SOURCES = \
 
 systemd_gnome_ask_password_agent_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUSGLIB_CFLAGS) \
 	$(LIBNOTIFY_CFLAGS) \
 	$(GTK_CFLAGS) \
 	-Wno-unused-variable \
@@ -955,16 +1011,19 @@ systemd_gnome_ask_password_agent_CFLAGS = \
 	-Wno-format-nonliteral
 
 systemd_gnome_ask_password_agent_VALAFLAGS = \
-	--pkg=dbus-glib-1 \
 	--pkg=posix \
 	--pkg=gtk+-2.0 \
 	--pkg=linux \
 	--pkg=gio-unix-2.0 \
-	--pkg=libnotify \
+	--pkg=libnotify
+if LIBNOTIFY07
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+	-D LIBNOTIFY07
+endif
+systemd_gnome_ask_password_agent_VALAFLAGS += \
 	-g
 
 systemd_gnome_ask_password_agent_LDADD = \
-	$(DBUSGLIB_LIBS) \
 	$(LIBNOTIFY_LIBS) \
 	$(GTK_LIBS)
 
@@ -978,8 +1037,7 @@ systemd_tty_ask_password_agent_LDADD = \
 
 pam_systemd_la_SOURCES = \
 	src/pam-module.c \
-	src/cgroup-util.c \
-	src/sd-daemon.c
+	src/cgroup-util.c
 
 pam_systemd_la_CFLAGS = \
 	$(AM_CFLAGS)
@@ -994,6 +1052,7 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
 	libsystemd-basic.la \
+	libsystemd-daemon.la \
 	$(PAM_LIBS)
 
 SED_PROCESS = \
@@ -1113,8 +1172,12 @@ CLEANFILES += \
 	${XML_IN_FILES:.xml.in=.html.in}
 endif
 
+DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+
 org.freedesktop.systemd1.%.xml: systemd
-	$(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@
+	$(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
+		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
 CLEANFILES += \
 	$(dbusinterface_DATA)
@@ -1179,21 +1242,22 @@ install-data-hook:
 			remount-rootfs.service \
 			var-run.mount \
 			var-lock.mount \
-			cryptsetup.target && \
+			media.mount && \
 		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
 		$(LN_S) ../fsck-root.service fsck-root.service && \
 		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
 		$(LN_S) ../var-run.mount var-run.mount && \
 		$(LN_S) ../var-lock.mount var-lock.mount && \
-		$(LN_S) ../cryptsetup.target )
+		$(LN_S) ../media.mount media.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
-		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
+		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
 		$(LN_S) $(systemunitdir)/sockets.target sockets.target && \
 		$(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
 		$(LN_S) $(systemunitdir)/swap.target swap.target && \
 		$(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
-		$(LN_S) $(systemunitdir)/printer.target printer.target)
+		$(LN_S) $(systemunitdir)/printer.target printer.target && \
+		$(LN_S) $(systemunitdir)/sound.target sound.target )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
 		$(LN_S) poweroff.target runlevel0.target && \
@@ -1241,7 +1305,9 @@ install-data-hook:
 			systemd-random-seed-load.service \
 			systemd-tmpfiles-setup.service \
 			systemd-sysctl.service \
-			systemd-ask-password-console.path && \
+			systemd-ask-password-console.path \
+			systemd-kmsg-syslogd.service \
+			cryptsetup.target && \
 		$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
 		$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
 		$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
@@ -1252,34 +1318,30 @@ install-data-hook:
 		$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
 		$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
 		$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
-		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
+		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
+		$(LN_S) ../systemd-kmsg-syslogd.service && \
+		$(LN_S) ../cryptsetup.target cryptsetup.target )
 	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
 		rm -f systemd-tmpfiles-clean.timer && \
 		$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
 	( cd $(DESTDIR)$(dbussessionservicedir) && \
 		rm -f org.freedesktop.systemd1.service && \
 		$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if TARGET_FEDORA
+if HAVE_PLYMOUTH
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
 		$(DESTDIR)$(systemunitdir)/reboot.target.wants \
 		$(DESTDIR)$(systemunitdir)/kexec.target.wants \
 		$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
-		$(DESTDIR)$(systemunitdir)/halt.target.wants \
-		$(DESTDIR)$(systemunitdir)/final.target.wants
-	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-		rm -f rc-local.service && \
-		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
-	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+		$(DESTDIR)$(systemunitdir)/halt.target.wants
 	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
 		rm -f plymouth-start.service plymouth-read-write.service && \
 		$(LN_S) ../plymouth-start.service plymouth-start.service && \
 		$(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
 	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-		rm -f plymouth-quit.service  && \
-		$(LN_S) ../plymouth-quit.service plymouth-quit.service )
+		rm -f plymouth-quit.service plymouth-quit-wait.service && \
+		$(LN_S) ../plymouth-quit.service plymouth-quit.service && \
+		$(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
 	( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
 		rm -f plymouth-reboot.service && \
 		$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
@@ -1292,6 +1354,16 @@ if TARGET_FEDORA
 	( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
 		rm -f plymouth-halt.service && \
 		$(LN_S) ../plymouth-halt.service plymouth-halt.service )
+endif
+
+if TARGET_FEDORA
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+		rm -f rc-local.service && \
+		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+	( 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 )
@@ -1299,14 +1371,23 @@ if TARGET_FEDORA
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
-if TARGET_GENTOO
+
+if TARGET_MANDRIVA
+	$(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+		rm -f rc-local.service && \
+		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+	( 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) xdm.service display-manager.service )
+		$(LN_S) prefdm.service display-manager.service )
 	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
+
 if TARGET_DEBIAN_OR_UBUNTU
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f runlevel5.target && \
@@ -1329,8 +1410,3 @@ 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 $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
-	rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount