chiark / gitweb /
build: expose libcryptsetup dependency in build string
[elogind.git] / Makefile.am
index dcaf382fb4f4dc45d930b6eaad902c1d1fb33347..8cc25306f5e49ec16c7556a36f577bb5591a1539 100644 (file)
@@ -26,11 +26,13 @@ udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
+bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
-sessionunitdir=$(pkgdatadir)/session
+userunitdir=$(pkgdatadir)/user
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
+usergeneratordir=$(pkglibexecdir)/user-generators
 
 # And these are the special ones for /
 rootdir=@rootdir@
@@ -38,6 +40,7 @@ rootbindir=$(rootdir)/bin
 rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
+systemgeneratordir=$(rootdir)/lib/systemd/system-generators
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -46,16 +49,19 @@ AM_CPPFLAGS = \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
        -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-       -DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
-       -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-       -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-       -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
+       -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
+       -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
+       -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
+       -DSYSTEMD_CGROUP_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=\"$(rootsbindir)/kexec\" \
+       -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
+       -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
+       -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -81,7 +87,8 @@ rootbin_PROGRAMS = \
        systemd \
        systemctl \
        systemd-notify \
-       systemd-ask-password
+       systemd-ask-password \
+       systemd-tty-ask-password-agent
 
 bin_PROGRAMS = \
        systemd-cgls
@@ -110,7 +117,17 @@ rootlibexec_PROGRAMS = \
        systemd-tmpfiles \
        systemd-user-sessions \
        systemd-fsck \
-       systemd-quotacheck
+       systemd-quotacheck \
+       systemd-timestamp \
+       systemd-ac-power
+
+if HAVE_LIBCRYPTSETUP
+rootlibexec_PROGRAMS += \
+       systemd-cryptsetup
+
+systemgenerator_PROGRAMS = \
+       systemd-cryptsetup-generator
+endif
 
 noinst_PROGRAMS = \
        test-engine \
@@ -120,7 +137,8 @@ noinst_PROGRAMS = \
        test-hostname \
        test-daemon \
        test-cgroup \
-       test-env-replace
+       test-env-replace \
+       test-strv
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -154,6 +172,9 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Swap.xml \
        org.freedesktop.systemd1.Path.xml
 
+dist_bashcompletion_DATA = \
+        src/systemctl-bash-completion.sh
+
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
        tmpfiles.d/x11.conf
@@ -161,6 +182,7 @@ dist_tmpfiles_DATA = \
 dist_systemunit_DATA = \
        units/emergency.service \
        units/emergency.target \
+       units/sysinit.target \
        units/basic.target \
        units/getty.target \
        units/halt.target \
@@ -196,7 +218,6 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
-       units/tmp.mount \
        units/var-lock.mount \
        units/var-run.mount \
        units/hwclock-load.service \
@@ -208,10 +229,11 @@ dist_systemunit_DATA = \
        units/smartcard.target \
        units/systemd-readahead-done.timer \
        units/systemd-tmpfiles-clean.timer \
-       units/quotaon.service
+       units/quotaon.service \
+       units/systemd-ask-password-wall.path \
+       units/systemd-ask-password-plymouth.path
 
 nodist_systemunit_DATA = \
-       units/sysinit.target \
        units/getty@.service \
        units/serial-getty@.service \
        units/graphical.target \
@@ -234,6 +256,8 @@ nodist_systemunit_DATA = \
        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 \
@@ -241,23 +265,24 @@ nodist_systemunit_DATA = \
        units/kexec.service \
        units/fsck@.service \
        units/fsck-root.service \
-       units/quotacheck.service
+       units/quotacheck.service \
+       units/rescue.service
 
-dist_sessionunit_DATA = \
-       units/session/default.target \
-       units/session/exit.target
+dist_userunit_DATA = \
+       units/user/default.target \
+       units/user/exit.target
 
-nodist_sessionunit_DATA = \
-       units/session/remote-fs.target \
-       units/session/exit.service
+nodist_userunit_DATA = \
+       units/user/remote-fs.target \
+       units/user/exit.service
 
 EXTRA_DIST = \
-       units/sysinit.target.m4 \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
        units/graphical.target.m4 \
        units/multi-user.target.m4 \
        units/remote-fs.target.m4 \
+       units/rescue.service.m4 \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
@@ -275,12 +300,14 @@ EXTRA_DIST = \
        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/user/exit.service.in \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
@@ -291,27 +318,15 @@ dist_systemunit_DATA += \
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service \
-       units/fedora/sysinit.service \
-       units/fedora/single.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
 endif
 
-if TARGET_DEBIAN
-dist_systemunit_DATA += \
-       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/fsck.target
-endif
-
 if TARGET_GENTOO
 dist_systemunit_DATA += \
        units/gentoo/xdm.service
@@ -319,7 +334,6 @@ endif
 
 if TARGET_ARCH
 dist_systemunit_DATA += \
-       units/arch/sysinit.service \
        units/arch/rc-local.service
 endif
 
@@ -398,6 +412,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 \
@@ -449,7 +464,8 @@ EXTRA_DIST += \
        src/build.h \
        src/shutdownd.h \
        src/umount.h \
-       src/readahead-common.h
+       src/readahead-common.h \
+       src/ask-password-api.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -482,7 +498,8 @@ MANPAGES = \
        man/halt.8 \
        man/shutdown.8 \
        man/pam_systemd.8 \
-       man/systemd.conf.5
+       man/systemd.conf.5 \
+       man/tmpfiles.d.5
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -595,6 +612,15 @@ test_env_replace_CFLAGS = \
 test_env_replace_LDADD = \
        libsystemd-basic.la
 
+test_strv_SOURCES = \
+       src/test-strv.c
+
+test_strv_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_strv_LDADD = \
+       libsystemd-basic.la
+
 systemd_logger_SOURCES = \
        src/logger.c \
        src/sd-daemon.c \
@@ -706,6 +732,48 @@ systemd_quotacheck_CFLAGS = \
 systemd_quotacheck_LDADD = \
        libsystemd-basic.la
 
+systemd_timestamp_SOURCES = \
+       src/timestamp.c
+
+systemd_timestamp_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_timestamp_LDADD = \
+       libsystemd-basic.la
+
+systemd_ac_power_SOURCES = \
+       src/ac-power.c
+
+systemd_ac_power_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
+
+systemd_ac_power_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
+
+systemd_cryptsetup_SOURCES = \
+       src/cryptsetup.c \
+       src/ask-password-api.c
+
+systemd_cryptsetup_CFLAGS = \
+       $(LIBCRYPTSETUP_CFLAGS) \
+       $(AM_CFLAGS)
+
+systemd_cryptsetup_LDADD = \
+       $(LIBCRYPTSETUP_LIBS) \
+       libsystemd-basic.la
+
+systemd_cryptsetup_generator_SOURCES = \
+       src/cryptsetup-generator.c \
+       src/unit-name.c
+
+systemd_cryptsetup_generator_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_cryptsetup_generator_LDADD = \
+       libsystemd-basic.la
+
 systemd_user_sessions_SOURCES = \
        src/user-sessions.c \
        src/cgroup-util.c
@@ -786,7 +854,8 @@ systemd_notify_LDADD = \
        libsystemd-basic.la
 
 systemd_ask_password_SOURCES = \
-       src/ask-password.c
+       src/ask-password.c \
+       src/ask-password-api.c
 
 systemd_ask_password_LDADD = \
        libsystemd-basic.la
@@ -861,6 +930,7 @@ systemd_gnome_ask_password_agent_SOURCES = \
 systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUSGLIB_CFLAGS) \
+       $(LIBNOTIFY_CFLAGS) \
        $(GTK_CFLAGS) \
        -Wno-unused-variable \
        -Wno-unused-function \
@@ -878,8 +948,17 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
 
 systemd_gnome_ask_password_agent_LDADD = \
        $(DBUSGLIB_LIBS) \
+       $(LIBNOTIFY_LIBS) \
        $(GTK_LIBS)
 
+systemd_tty_ask_password_agent_SOURCES = \
+       src/tty-ask-password-agent.c \
+       src/ask-password-api.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 \
@@ -903,6 +982,7 @@ 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' \
@@ -913,7 +993,7 @@ SED_PROCESS = \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
                -e 's,@prefix\@,$(prefix),g' \
-               < $< > $@
+               < $< > $@ || rm $@
 
 units/%: units/%.in Makefile
        $(SED_PROCESS)
@@ -926,21 +1006,21 @@ man/%: man/%.in Makefile
 
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
+       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
 
-M4_PROCESS_SESSION = \
+M4_PROCESS_USER = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
+       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_USER=1 < $< > $@ || rm $@
 
 units/%: units/%.m4 Makefile
        $(M4_PROCESS_SYSTEM)
 
-units/session/%: units/%.m4 Makefile
-       $(M4_PROCESS_SESSION)
+units/user/%: units/%.m4 Makefile
+       $(M4_PROCESS_USER)
 
 CLEANFILES = \
        $(nodist_systemunit_DATA) \
-       $(nodist_sessionunit_DATA) \
+       $(nodist_userunit_DATA) \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA)
@@ -1025,7 +1105,8 @@ CLEANFILES += \
 install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
-               $(DESTDIR)$(sessionunitdir) \
+               $(DESTDIR)$(userunitdir) \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
                $(DESTDIR)$(systemunitdir)/basic.target.wants \
                $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
@@ -1036,17 +1117,17 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
                $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
                $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+               $(DESTDIR)$(systemunitdir)/graphical.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
-               $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/sysinit.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)$(pkgsysconfdir)/user \
                $(DESTDIR)$(sysconfdir)/xdg/systemd
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
-               rm -f session && \
-               $(LN_S) $(pkgsysconfdir)/session session )
+               rm -f user && \
+               $(LN_S) $(pkgsysconfdir)/user user )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
                rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
                $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
@@ -1086,7 +1167,7 @@ install-data-hook:
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../var-run.mount var-run.mount && \
                $(LN_S) ../var-lock.mount var-lock.mount )
-       ( cd $(DESTDIR)$(sessionunitdir) && \
+       ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
                $(LN_S) $(systemunitdir)/sockets.target sockets.target && \
@@ -1108,9 +1189,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 systemd-user-sessions.service && \
+               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-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 && \
@@ -1126,10 +1208,10 @@ 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)$(pkgsysconfdir)/system/basic.target.wants && \
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
                rm -f hwclock-load.service && \
                $(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
-       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f dev-hugepages.automount \
                        dev-mqueue.automount \
                        proc-sys-fs-binfmt_misc.automount \
@@ -1139,8 +1221,7 @@ install-data-hook:
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
-                       sysctl.service \
-                       systemd-tmpfiles-clean.timer && \
+                       sysctl.service && \
                $(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 && \
@@ -1150,7 +1231,9 @@ install-data-hook:
                $(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) ../sysctl.service sysctl.service )
+       ( 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 && \
@@ -1159,32 +1242,30 @@ if TARGET_FEDORA
        $(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)/rescue.target.wants \
-               $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
                $(DESTDIR)$(systemunitdir)/final.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 && \
-               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)/sysinit.target.wants && \
+               rm -f plymouth-start.service systemd-ask-password-plymouth.path plymouth-read-write.service && \
+               $(LN_S) ../plymouth-start.service plymouth-start.service && \
+               $(LN_S) ../plymouth-read-write.service plymouth-read-write.service && \
+               $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f plymouth-quit.service && \
+               rm -f plymouth-quit.service  && \
                $(LN_S) ../plymouth-quit.service plymouth-quit.service )
        ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
                rm -f plymouth-reboot.service && \
                $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+       ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
+               rm -f plymouth-kexec.service && \
+               $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
        ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
                rm -f plymouth-poweroff.service && \
                $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
@@ -1192,38 +1273,25 @@ 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 )
+       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+               rm -f display-manager.service && \
+               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 if TARGET_GENTOO
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+       ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/xdm.service display-manager.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f xdm.service && \
-               $(LN_S) $(systemunitdir)/xdm.service xdm.service )
+               $(LN_S) xdm.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
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/umount.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
-               rm -f umountfs.service umountnfs.service umountroot.service && \
-               $(LN_S) ../umountfs.service umountfs.service && \
-               $(LN_S) ../umountnfs.service umountnfs.service && \
-               $(LN_S) ../umountroot.service umountroot.service )
+if TARGET_DEBIAN_OR_UBUNTU
        ( cd $(DESTDIR)$(systemunitdir) && \
                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) \
@@ -1244,5 +1312,5 @@ 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.mount
-       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