X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3c65febb500c56fcc7d0edc5ac9cd32c0ef0142e;hp=973d341ea39851e4f1f7db9930b2401a085cb051;hb=73d35ff8e475d17a22fc524ae003553021acaa8e;hpb=34c8deaae1fcfa9e7c9db49b5f3a33973e103218

diff --git a/Makefile.am b/Makefile.am
index 973d341ea..3c65febb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ tmpfilesdir=$(sysconfdir)/tmpfiles.d
 # And these are the special ones for /
 rootdir=@rootdir@
 rootbindir=$(rootdir)/bin
+rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
 
@@ -50,9 +51,12 @@ AM_CPPFLAGS = \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
 	-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
 	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+	-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
+	-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
 	-DRUNTIME_DIR=\"$(localstatedir)/run\" \
 	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
+	-DKEXEC_BINARY_PATH=\"/sbin/kexec\" \
 	-I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -61,17 +65,25 @@ AM_CPPFLAGS += \
 	-DKBD_SETFONT=\"/usr/bin/setfont\" \
 	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_ARCH
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
 	-DKBD_SETFONT=\"/bin/setfont\" \
 	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
 endif
+endif
 
 rootbin_PROGRAMS = \
 	systemd \
 	systemctl \
 	systemd-notify \
-	systemd-ask-password
+	systemd-ask-password \
+	systemd-tty-ask-password-agent
 
 bin_PROGRAMS = \
 	systemd-cgls
@@ -79,7 +91,7 @@ bin_PROGRAMS = \
 if HAVE_GTK
 bin_PROGRAMS += \
 	systemadm \
-	systemd-ask-password-agent
+	systemd-gnome-ask-password-agent
 endif
 
 rootlibexec_PROGRAMS = \
@@ -89,6 +101,7 @@ rootlibexec_PROGRAMS = \
 	systemd-update-utmp \
 	systemd-random-seed \
 	systemd-shutdownd \
+	systemd-shutdown \
 	systemd-modules-load \
 	systemd-remount-api-vfs \
 	systemd-kmsg-syslogd \
@@ -96,7 +109,10 @@ rootlibexec_PROGRAMS = \
 	systemd-reply-password \
 	systemd-readahead-collect \
 	systemd-readahead-replay \
-	systemd-tmpfiles
+	systemd-tmpfiles \
+	systemd-user-sessions \
+	systemd-fsck \
+	systemd-quotacheck
 
 noinst_PROGRAMS = \
 	test-engine \
@@ -150,6 +166,7 @@ dist_systemunit_DATA = \
 	units/basic.target \
 	units/getty.target \
 	units/halt.target \
+	units/kexec.target \
 	units/local-fs.target \
 	units/network.target \
 	units/nss-lookup.target \
@@ -161,6 +178,7 @@ dist_systemunit_DATA = \
 	units/rpcbind.target \
 	units/rtc-set.target \
 	units/shutdown.target \
+	units/final.target \
 	units/umount.target \
 	units/sigpwr.target \
 	units/sockets.target \
@@ -169,7 +187,7 @@ dist_systemunit_DATA = \
 	units/systemd-initctl.socket \
 	units/systemd-logger.socket \
 	units/systemd-shutdownd.socket \
-	units/systemd-kmsg-syslogd.socket \
+	units/syslog.socket \
 	units/dev-hugepages.automount \
 	units/dev-hugepages.mount \
 	units/dev-mqueue.automount \
@@ -181,11 +199,8 @@ dist_systemunit_DATA = \
 	units/sys-kernel-security.automount \
 	units/sys-kernel-security.mount \
 	units/tmp.mount \
-	units/tmp.service \
 	units/var-lock.mount \
-	units/var-lock.service \
 	units/var-run.mount \
-	units/var-run.service \
 	units/hwclock-load.service \
 	units/hwclock-save.service \
 	units/sysctl.service \
@@ -193,8 +208,11 @@ dist_systemunit_DATA = \
 	units/printer.target \
 	units/bluetooth.target \
 	units/smartcard.target \
-	units/tmpwatch.service \
-	units/tmpwatch.timer
+	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
 
 nodist_systemunit_DATA = \
 	units/sysinit.target \
@@ -216,10 +234,24 @@ nodist_systemunit_DATA = \
 	units/systemd-random-seed-load.service \
 	units/systemd-readahead-collect.service \
 	units/systemd-readahead-replay.service \
-	units/syslog.target
+	units/systemd-readahead-done.service \
+	units/systemd-tmpfiles-setup.service \
+	units/systemd-tmpfiles-clean.service \
+	units/systemd-user-sessions.service \
+	units/systemd-ask-password-wall.service \
+	units/systemd-ask-password-plymouth.service \
+	units/syslog.target \
+	units/halt.service \
+	units/poweroff.service \
+	units/reboot.service \
+	units/kexec.service \
+	units/fsck@.service \
+	units/fsck-root.service \
+	units/quotacheck.service
 
 dist_sessionunit_DATA = \
-	units/session/default.target
+	units/session/default.target \
+	units/session/exit.target
 
 nodist_sessionunit_DATA = \
 	units/session/remote-fs.target \
@@ -245,18 +277,28 @@ EXTRA_DIST = \
 	units/systemd-random-seed-load.service.in \
 	units/systemd-readahead-collect.service.in \
 	units/systemd-readahead-replay.service.in \
+	units/systemd-readahead-done.service.in \
+	units/systemd-tmpfiles-setup.service.in \
+	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/syslog.target.in \
+	units/halt.service.in \
+	units/poweroff.service.in \
+	units/reboot.service.in \
+	units/kexec.service.in \
 	units/session/exit.service.in \
+	units/fsck@.service.in \
+	units/fsck-root.service.in \
+	units/quotacheck.service.in \
 	systemd.pc.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
-	units/fedora/halt.service \
-	units/fedora/killall.service \
-	units/fedora/poweroff.service \
 	units/fedora/prefdm.service \
 	units/fedora/rc-local.service \
-	units/fedora/reboot.service \
+	units/fedora/halt-local.service \
 	units/fedora/sysinit.service \
 	units/fedora/single.service \
 	units/fedora/plymouth-quit.service \
@@ -265,42 +307,21 @@ dist_systemunit_DATA += \
 	units/fedora/plymouth-halt.service
 endif
 
-if TARGET_DEBIAN
+if TARGET_DEBIAN_OR_UBUNTU
 dist_systemunit_DATA += \
-	units/debian/halt.service \
-	units/debian/killall.service \
-	units/debian/poweroff.service \
-	units/debian/reboot.service \
-	units/debian/fsck.target \
 	units/debian/umountfs.service \
 	units/debian/umountnfs.service \
 	units/debian/umountroot.service
 endif
 
-if TARGET_SUSE
-dist_systemunit_DATA += \
-	units/suse/halt.service \
-	units/suse/poweroff.service \
-	units/suse/reboot.service \
-	units/suse/fsck.target
-endif
-
 if TARGET_GENTOO
 dist_systemunit_DATA += \
-	units/gentoo/halt.service \
-	units/gentoo/killall.service \
-	units/gentoo/poweroff.service \
-	units/gentoo/reboot.service \
 	units/gentoo/xdm.service
 endif
 
 if TARGET_ARCH
 dist_systemunit_DATA += \
-	units/arch/sysinit.service \
-	units/arch/rc-local.service \
-	units/arch/halt.service \
-	units/arch/poweroff.service \
-	units/arch/reboot.service
+	units/arch/rc-local.service
 endif
 
 dist_doc_DATA = \
@@ -308,7 +329,9 @@ dist_doc_DATA = \
 	LICENSE \
 	DISTRO_PORTING \
 	src/sd-daemon.h \
-	src/sd-daemon.c
+	src/sd-daemon.c \
+	src/sd-readahead.h \
+	src/sd-readahead.c
 
 pkgconfigdata_DATA = \
 	systemd.pc
@@ -356,6 +379,7 @@ libsystemd_core_la_SOURCES = \
 	src/path.c \
 	src/load-dropin.c \
 	src/execute.c \
+	src/utmp-wtmp.c \
 	src/exit-status.c \
 	src/dbus.c \
 	src/dbus-manager.c \
@@ -375,6 +399,7 @@ libsystemd_core_la_SOURCES = \
 	src/cgroup.c \
 	src/mount-setup.c \
 	src/hostname-setup.c \
+	src/selinux-setup.c \
 	src/loopback-setup.c \
 	src/kmod-setup.c \
 	src/locale-setup.c \
@@ -383,7 +408,8 @@ libsystemd_core_la_SOURCES = \
 	src/fdset.c \
 	src/namespace.c \
 	src/tcpwrap.c \
-	src/cgroup-util.c
+	src/cgroup-util.c \
+	src/condition.c
 
 libsystemd_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -417,13 +443,14 @@ EXTRA_DIST += \
 	src/linux/fanotify.h \
 	src/initreq.h \
 	src/sd-daemon.h \
+	src/sd-readahead.h \
 	src/special.h \
 	src/dbus-common.h \
 	src/bus-errors.h \
 	src/cgroup-show.h \
-	src/utmp-wtmp.h \
 	src/build.h \
 	src/shutdownd.h \
+	src/umount.h \
 	src/readahead-common.h
 
 MANPAGES = \
@@ -451,6 +478,7 @@ MANPAGES = \
 	man/systemd.exec.5 \
 	man/daemon.7 \
 	man/sd-daemon.7 \
+	man/sd-readahead.7 \
 	man/runlevel.8 \
 	man/telinit.8 \
 	man/halt.8 \
@@ -626,13 +654,26 @@ systemd_shutdownd_CFLAGS = \
 systemd_shutdownd_LDADD = \
 	libsystemd-basic.la
 
+systemd_shutdown_SOURCES = \
+	src/mount-setup.c \
+	src/umount.c \
+	src/shutdown.c
+
+systemd_shutdown_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(UDEV_CFLAGS)
+
+systemd_shutdown_LDADD = \
+	libsystemd-basic.la \
+	$(UDEV_LIBS)
+
 systemd_modules_load_SOURCES = \
 	src/modules-load.c
 
 systemd_modules_load_CFLAGS = \
 	$(AM_CFLAGS)
 
-systemd_tmpfiles_LDADD = \
+systemd_modules_load_LDADD = \
 	libsystemd-basic.la
 
 systemd_tmpfiles_SOURCES = \
@@ -641,7 +682,40 @@ systemd_tmpfiles_SOURCES = \
 systemd_tmpfiles_CFLAGS = \
 	$(AM_CFLAGS)
 
-systemd_modules_load_LDADD = \
+systemd_tmpfiles_LDADD = \
+	libsystemd-basic.la
+
+systemd_fsck_SOURCES = \
+	src/fsck.c \
+	src/dbus-common.c
+
+systemd_fsck_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(UDEV_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemd_fsck_LDADD = \
+	libsystemd-basic.la \
+	$(UDEV_LIBS) \
+	$(DBUS_LIBS)
+
+systemd_quotacheck_SOURCES = \
+	src/quotacheck.c
+
+systemd_quotacheck_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_quotacheck_LDADD = \
+	libsystemd-basic.la
+
+systemd_user_sessions_SOURCES = \
+	src/user-sessions.c \
+	src/cgroup-util.c
+
+systemd_user_sessions_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_user_sessions_LDADD = \
 	libsystemd-basic.la
 
 systemd_vconsole_setup_SOURCES = \
@@ -694,7 +768,8 @@ systemctl_SOURCES = \
 	src/sd-daemon.c \
 	src/cgroup-show.c \
 	src/cgroup-util.c \
-	src/exit-status.c
+	src/exit-status.c \
+	src/unit-name.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -706,7 +781,8 @@ systemctl_LDADD = \
 
 systemd_notify_SOURCES = \
 	src/notify.c \
-	src/sd-daemon.c
+	src/sd-daemon.c \
+	src/sd-readahead.c
 
 systemd_notify_LDADD = \
 	libsystemd-basic.la
@@ -781,10 +857,10 @@ systemadm_LDADD = \
 	$(DBUSGLIB_LIBS) \
 	$(GTK_LIBS)
 
-systemd_ask_password_agent_SOURCES = \
-	src/ask-password-agent.vala
+systemd_gnome_ask_password_agent_SOURCES = \
+	src/gnome-ask-password-agent.vala
 
-systemd_ask_password_agent_CFLAGS = \
+systemd_gnome_ask_password_agent_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUSGLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
@@ -793,7 +869,7 @@ systemd_ask_password_agent_CFLAGS = \
 	-Wno-shadow \
 	-Wno-format-nonliteral
 
-systemd_ask_password_agent_VALAFLAGS = \
+systemd_gnome_ask_password_agent_VALAFLAGS = \
 	--pkg=dbus-glib-1 \
 	--pkg=posix \
 	--pkg=gtk+-2.0 \
@@ -802,10 +878,17 @@ systemd_ask_password_agent_VALAFLAGS = \
 	--pkg=libnotify \
 	-g
 
-systemd_ask_password_agent_LDADD = \
+systemd_gnome_ask_password_agent_LDADD = \
 	$(DBUSGLIB_LIBS) \
 	$(GTK_LIBS)
 
+systemd_tty_ask_password_agent_SOURCES = \
+	src/tty-ask-password-agent.c \
+	src/utmp-wtmp.c
+
+systemd_tty_ask_password_agent_LDADD = \
+	libsystemd-basic.la
+
 pam_systemd_la_SOURCES = \
 	src/pam-module.c \
 	src/cgroup-util.c \
@@ -829,8 +912,10 @@ pam_systemd_la_LIBADD = \
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
+                -e 's,@rootbindir\@,$(rootbindir),g' \
 		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
 		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
+		-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
 		-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
 		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
 		-e 's,@systemunitdir\@,$(systemunitdir),g' \
@@ -962,19 +1047,22 @@ install-data-hook:
 		$(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
 		$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system \
-		$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/session \
 		$(DESTDIR)$(sysconfdir)/xdg/systemd
 	( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
 		rm -f session && \
 		$(LN_S) $(pkgsysconfdir)/session session )
 	( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-		rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket && \
+		rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
 		$(LN_S) ../systemd-logger.socket systemd-logger.socket && \
 		$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
-		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
+		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
+		$(LN_S) ../syslog.socket syslog.socket )
 	( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
 		rm -f systemd-update-utmp-runlevel.service && \
 		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
@@ -999,17 +1087,15 @@ install-data-hook:
 		$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
 	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
 		rm -f systemd-remount-api-vfs.service \
+			fsck-root.service \
 			remount-rootfs.service \
 			var-run.mount \
-			var-run.service \
-			var-lock.mount \
-			var-lock.service && \
+			var-lock.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-run.service var-run.service && \
-		$(LN_S) ../var-lock.mount var-lock.mount && \
-		$(LN_S) ../var-lock.service var-lock.service )
+		$(LN_S) ../var-lock.mount var-lock.mount )
 	( cd $(DESTDIR)$(sessionunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -1032,8 +1118,10 @@ install-data-hook:
 		$(LN_S) graphical.target default.target && \
 		$(LN_S) reboot.target ctrl-alt-del.target )
 	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-		rm -f getty.target && \
-		$(LN_S) ../getty.target getty.target )
+		rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
+		$(LN_S) ../getty.target getty.target && \
+		$(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
+		$(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
 		rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
@@ -1042,9 +1130,16 @@ install-data-hook:
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
+		rm -f quotaon.service quotacheck.service && \
+		$(LN_S) $(systemunitdir)/quotacheck.service quotacheck.service && \
+		$(LN_S) $(systemunitdir)/quotaon.service quotaon.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
 		rm -f remote-fs.target && \
 		$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants && \
+		rm -f hwclock-load.service && \
+		$(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
 	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
 		rm -f dev-hugepages.automount \
 			dev-mqueue.automount \
@@ -1054,9 +1149,9 @@ install-data-hook:
 			systemd-vconsole-setup.service \
 			systemd-modules-load.service \
 			systemd-random-seed-load.service \
+			systemd-tmpfiles-setup.service \
 			sysctl.service \
-			tmpwatch.timer \
-			tmpwatch.service && \
+			systemd-tmpfiles-clean.timer && \
 		$(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 && \
@@ -1065,9 +1160,9 @@ install-data-hook:
 		$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
 		$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
 		$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
+		$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
 		$(LN_S) ../sysctl.service sysctl.service && \
-		$(LN_S) ../tmpwatch.timer tmpwatch.timer && \
-		$(LN_S) ../tmpwatch.service tmpwatch.service )
+		$(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 )
@@ -1078,22 +1173,24 @@ if TARGET_FEDORA
 		$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
 		$(DESTDIR)$(systemunitdir)/halt.target.wants \
 		$(DESTDIR)$(systemunitdir)/rescue.target.wants \
-		$(DESTDIR)$(systemunitdir)/multi-user.target.wants
-	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
+		$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+		$(DESTDIR)$(systemunitdir)/final.target.wants
+	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
 		rm -f prefdm.service && \
 		$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.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)/rescue.target.wants && \
 		rm -f single.service && \
 		$(LN_S) $(systemunitdir)/single.service single.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 systemd-ask-password-plymouth.path && \
+		$(LN_S) ../plymouth-quit.service plymouth-quit.service && \
+		$(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
 	( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
 		rm -f plymouth-reboot.service && \
 		$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
@@ -1104,10 +1201,8 @@ if TARGET_FEDORA
 		rm -f plymouth-halt.service && \
 		$(LN_S) ../plymouth-halt.service plymouth-halt.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f local.service && \
-		$(LN_S) rc-local.service local.service )
-	( cd $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) && \
-		$(LN_S) halt reboot > /dev/null 2>&1 || true )
+		rm -f display-manager.service && \
+		$(LN_S) prefdm.service display-manager.service )
 endif
 if TARGET_GENTOO
 	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
@@ -1117,7 +1212,7 @@ if TARGET_GENTOO
 		rm -f xdm.service && \
 		$(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
-if TARGET_DEBIAN
+if TARGET_DEBIAN_OR_UBUNTU
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(systemunitdir)/umount.target.wants
 	( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
@@ -1129,13 +1224,6 @@ if TARGET_DEBIAN
 		rm -f runlevel5.target && \
 		$(LN_S) multi-user.target runlevel5.target )
 endif
-if !TARGET_SUSE
-if !TARGET_DEBIAN
-	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f fsck.target && \
-		$(LN_S) sysinit.target fsck.target )
-endif
-endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -1156,7 +1244,7 @@ git-tag:
 
 # 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
+	rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
+	rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount
+	sed -i -e 's/^#MountAuto=yes$$/MountAuto=no/' \
+		-e 's/^#SwapAuto=yes$$/SwapAuto=no/' $(DESTDIR)/etc/systemd/system.conf