units: getty.target is pulled in via /lib these days

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 973d341ea39851e4f1f7db9930b2401a085cb051..0a33c0635b150a1948bb4f4820bcfc4824d90839 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,11 +181,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 \
@@ -194,7 +191,8 @@ dist_systemunit_DATA = \
        units/bluetooth.target \
        units/smartcard.target \
        units/tmpwatch.service \
-       units/tmpwatch.timer
+       units/tmpwatch.timer \
+       units/systemd-readahead-done.timer
 
 nodist_systemunit_DATA = \
        units/sysinit.target \
@@ -216,6 +214,8 @@ nodist_systemunit_DATA = \
        units/systemd-random-seed-load.service \
        units/systemd-readahead-collect.service \
        units/systemd-readahead-replay.service \
+       units/systemd-readahead-done.service \
+       units/systemd-tmpfiles.service \
        units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -245,6 +245,8 @@ 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.service.in \
        units/syslog.target.in \
        units/session/exit.service.in \
        systemd.pc.in
@@ -831,6 +833,7 @@ SED_PROCESS = \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),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' \
@@ -1001,15 +1004,11 @@ install-data-hook:
                rm -f systemd-remount-api-vfs.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) ../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 && \
@@ -1054,6 +1053,7 @@ install-data-hook:
                        systemd-vconsole-setup.service \
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
+                       systemd-tmpfiles.service \
                        sysctl.service \
                        tmpwatch.timer \
                        tmpwatch.service && \
@@ -1065,6 +1065,7 @@ 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.service systemd-tmpfiles.service && \
                $(LN_S) ../sysctl.service sysctl.service && \
                $(LN_S) ../tmpwatch.timer tmpwatch.timer && \
                $(LN_S) ../tmpwatch.service tmpwatch.service )
@@ -1156,7 +1157,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.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