systemctl: require correctly formed unit names when enabling units

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fd163c8f1e469d42248c5a753d0ee5047ba7e7c7..4307db1a69e377e498a713f49b218cf95ac54c9e 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,7 @@ 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
 
@@ -246,6 +245,7 @@ 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 \
@@ -310,7 +310,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
@@ -419,6 +421,7 @@ 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 \
@@ -453,6 +456,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 \
@@ -696,7 +700,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) \
@@ -708,7 +713,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
@@ -833,6 +839,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' \
@@ -1003,15 +1010,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 && \
@@ -1160,7 +1163,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