# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
sessionunitdir=$(pkgdatadir)/session
+tmpfilesdir=$(sysconfdir)/tmpfiles.d
# And these are the special ones for /
rootdir=@rootdir@
systemd-remount-api-vfs \
systemd-kmsg-syslogd \
systemd-vconsole-setup \
- systemd-reply-password
+ systemd-reply-password \
+ systemd-readahead-collect \
+ systemd-readahead-replay \
+ systemd-tmpfiles
noinst_PROGRAMS = \
test-engine \
org.freedesktop.systemd1.Swap.xml \
org.freedesktop.systemd1.Path.xml
+dist_tmpfiles_DATA = \
+ tmpfiles.d/systemd.conf \
+ tmpfiles.d/x11.conf
+
dist_systemunit_DATA = \
units/emergency.service \
units/emergency.target \
units/sys-kernel-security.mount \
units/tmp.mount \
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 \
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 \
units/systemd-update-utmp-shutdown.service \
units/systemd-random-seed-save.service \
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 = \
units/systemd-update-utmp-shutdown.service.in \
units/systemd-random-seed-save.service.in \
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
src/list.h \
src/securebits.h \
src/linux/auto_dev-ioctl.h \
+ src/linux/fanotify.h \
src/initreq.h \
src/sd-daemon.h \
src/special.h \
src/cgroup-show.h \
src/utmp-wtmp.h \
src/build.h \
- src/shutdownd.h
+ src/shutdownd.h \
+ src/readahead-common.h
MANPAGES = \
man/systemd.1 \
man/systemd-cgls.1 \
man/systemd-notify.1 \
man/sd_notify.3 \
+ man/sd_readahead.3 \
man/sd_booted.3 \
man/sd_listen_fds.3 \
man/sd_is_fifo.3 \
systemd_modules_load_CFLAGS = \
$(AM_CFLAGS)
+systemd_tmpfiles_LDADD = \
+ libsystemd-basic.la
+
+systemd_tmpfiles_SOURCES = \
+ src/tmpfiles.c
+
+systemd_tmpfiles_CFLAGS = \
+ $(AM_CFLAGS)
+
systemd_modules_load_LDADD = \
libsystemd-basic.la
systemd_reply_password_LDADD = \
libsystemd-basic.la
+systemd_readahead_collect_SOURCES = \
+ src/readahead-collect.c \
+ src/sd-daemon.c \
+ src/readahead-common.c
+
+systemd_readahead_collect_CFLAGS = \
+ $(UDEV_CFLAGS)
+
+systemd_readahead_collect_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS)
+
+systemd_readahead_replay_SOURCES = \
+ src/readahead-replay.c \
+ src/sd-daemon.c \
+ src/readahead-common.c
+
+systemd_readahead_replay_CFLAGS = \
+ $(UDEV_CFLAGS)
+
+systemd_readahead_replay_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS)
+
systemd_cgls_SOURCES = \
src/cgls.c \
src/cgroup-show.c \
$(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' \
$(DESTDIR)$(systemunitdir) \
$(DESTDIR)$(sessionunitdir) \
$(DESTDIR)$(systemunitdir)/sockets.target.wants \
- $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+ $(DESTDIR)$(systemunitdir)/basic.target.wants \
$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
$(DESTDIR)$(systemunitdir)/local-fs.target.wants \
$(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
$(LN_S) ../hwclock-save.service hwclock-save.service && \
$(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
- rm -f systemd-update-utmp-shutdown.service \
- var-run.service \
- var-lock.service && \
- $(LN_S) ../var-run.service var-run.service && \
- $(LN_S) ../var-lock.service var-lock.service )
+ rm -f systemd-remount-api-vfs.service \
+ remount-rootfs.service \
+ var-run.mount \
+ 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-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 && \
rm -f default.target ctrl-alt-del.target && \
$(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 )
( 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 && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
- rm -f getty.target remote-fs.target && \
- $(LN_S) $(systemunitdir)/getty.target getty.target && \
+ rm -f remote-fs.target && \
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
- ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+ ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f dev-hugepages.automount \
dev-mqueue.automount \
proc-sys-fs-binfmt_misc.automount \
systemd-vconsole-setup.service \
systemd-modules-load.service \
systemd-random-seed-load.service \
+ systemd-tmpfiles.service \
sysctl.service \
tmpwatch.timer \
tmpwatch.service && \
$(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 )
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 /lib/systemd/system/local-fs.target.wants/var-run.mount
+ rm /lib/systemd/system/local-fs.target.wants/var-lock.mount