# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
sessionunitdir=$(pkgdatadir)/session
+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
-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\" \
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
+ -DKEXEC_BINARY_PATH=\"$(rootsbindir)/kexec\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
-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 \
systemd-update-utmp \
systemd-random-seed \
systemd-shutdownd \
+ systemd-shutdown \
systemd-modules-load \
systemd-remount-api-vfs \
systemd-kmsg-syslogd \
systemd-reply-password \
systemd-readahead-collect \
systemd-readahead-replay \
- systemd-tempfiles
+ systemd-tmpfiles \
+ systemd-user-sessions
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.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 \
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
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
src/list.h \
src/securebits.h \
src/linux/auto_dev-ioctl.h \
+ 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/shutdownd.h \
+ src/readahead-common.h
MANPAGES = \
man/systemd.1 \
man/systemd.exec.5 \
man/daemon.7 \
man/sd-daemon.7 \
+ man/sd-readahead.7 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
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_tempfiles_LDADD = \
+systemd_tmpfiles_LDADD = \
libsystemd-basic.la
-systemd_tempfiles_SOURCES = \
- src/tempfiles.c
+systemd_tmpfiles_SOURCES = \
+ src/tmpfiles.c
-systemd_tempfiles_CFLAGS = \
+systemd_tmpfiles_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_user_sessions_LDADD = \
+ libsystemd-basic.la
+
+systemd_user_sessions_SOURCES = \
+ src/user-sessions.c \
+ src/cgroup-util.c
+
+systemd_user_sessions_CFLAGS = \
$(AM_CFLAGS)
systemd_modules_load_LDADD = \
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) \
systemd_notify_SOURCES = \
src/notify.c \
- src/sd-daemon.c
+ src/sd-daemon.c \
+ src/sd-readahead.c
systemd_notify_LDADD = \
libsystemd-basic.la
$(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' \
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 && \
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 )
# 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 /lib/systemd/system/local-fs.target.wants/remount-rootfs.service
~ianmdlvl / elogind.git / blobdiff